mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-submodule: reduce output verbosity

Browse Source 
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:
Leif Middelschulte
2018-06-11 19:31:28 +02:00
committed by Junio C Hamano
parent 76f4212597
commit 40aac22b43
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -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(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
output_commit_title(o, commit_b); output_commit_title(o, commit_b);
} else if (show(o, 2)) } 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 else
; /* no output */ ; /* 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(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
output_commit_title(o, commit_a); output_commit_title(o, commit_a);
} else if (show(o, 2)) } 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 else
; /* no output */ ; /* no output */