diff options
| author | Leif Middelschulte <Leif.Middelschulte@gmail.com> | 2018-06-11 19:31:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-11 20:03:55 +0200 |
| commit | 40aac22b43c8f9c4cc3acf625fdec3a24368ed4c (patch) | |
| tree | a030bbc81514b0a67ebffb302bf1c4f7de345e06 | |
| parent | merge-recursive: give notice when submodule commit gets fast-forwarded (diff) | |
| download | git-40aac22b43c8f9c4cc3acf625fdec3a24368ed4c.tar.xz git-40aac22b43c8f9c4cc3acf625fdec3a24368ed4c.zip | |
merge-submodule: reduce output verbosity
The output shall behave more similar to ordinary file merges' output to provide
a more consistent user experience.
Signed-off-by: Leif Middelschulte <Leif.Middelschulte@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index a9aecccb8c..11c858d422 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1097,7 +1097,7 @@ static int merge_submodule(struct merge_options *o, output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path); output_commit_title(o, commit_b); } else if (show(o, 2)) - output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(b)); + output(o, 2, _("Fast-forwarding submodule %s"), path); else ; /* no output */ @@ -1109,7 +1109,7 @@ static int merge_submodule(struct merge_options *o, output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path); output_commit_title(o, commit_a); } else if (show(o, 2)) - output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(a)); + output(o, 2, _("Fast-forwarding submodule %s"), path); else ; /* no output */ |