Skip to content

Commit 40aac22

Browse files
leiflmgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 76f4212 commit 40aac22

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

merge-recursive.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,7 @@ static int merge_submodule(struct merge_options *o,
10971097
output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
10981098
output_commit_title(o, commit_b);
10991099
} else if (show(o, 2))
1100-
output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(b));
1100+
output(o, 2, _("Fast-forwarding submodule %s"), path);
11011101
else
11021102
; /* no output */
11031103

@@ -1109,7 +1109,7 @@ static int merge_submodule(struct merge_options *o,
11091109
output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
11101110
output_commit_title(o, commit_a);
11111111
} else if (show(o, 2))
1112-
output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(a));
1112+
output(o, 2, _("Fast-forwarding submodule %s"), path);
11131113
else
11141114
; /* no output */
11151115

0 commit comments

Comments
 (0)