Skip to content
Snippets Groups Projects
Commit 40aac22b authored by Leif Middelschulte's avatar Leif Middelschulte Committed by Junio C Hamano
Browse files

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: default avatarLeif Middelschulte <Leif.Middelschulte@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 76f42125
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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 */
 
Loading
Loading
@@ -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
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment