mirror of
https://github.com/git/git.git
synced 2024-11-05 22:19:47 +01:00
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>
This commit is contained in:
parent
76f4212597
commit
40aac22b43
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user