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>
Leif Middelschulte committed
Jun 11, 2018 at 19:31 UTC
40aac22b43c8f9c4cc3acf625fdec3a24368ed4c
1 file changed
+2
-2
merge-recursive.c
+2
-2
@@ -1097,7 +1097,7 @@ static int merge_submodule(struct merge_options *o,
1097
output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1098
output_commit_title(o, commit_b);
1099
} 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);
1101
else
1102
; /* no output */
1103
@@ -1109,7 +1109,7 @@ static int merge_submodule(struct merge_options *o,
1109
output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1110
output_commit_title(o, commit_a);
1111
} 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);
1113
else
1114
; /* no output */
1115