Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
merge-submodule: reduce output verbosity
author
Leif Middelschulte
<Leif.Middelschulte@gmail.com>
Mon, 11 Jun 2018 17:31:28 +0000
(19:31 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 11 Jun 2018 18:03:55 +0000
(11:03 -0700)
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>
merge-recursive.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
76f4212
)
diff --git
a/merge-recursive.c
b/merge-recursive.c
index a9aecccb8c3d59fda25eeae2596ee6b816223bde..11c858d422f61d936c061a6d9bca03eaf422a409 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-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, 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 */
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, 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 */
else
; /* no output */