diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-13 19:50:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-13 19:50:45 (GMT) |
| commit | 8d0d53a8cf2cc0d68e396df155beba8344d7810f (patch) | |
| tree | fbcc07c3522d51e88769f67457b92b27b9e34ad4 /merge-recursive.c | |
| parent | fb6ac9e79ae47aa55bb1c8b151afa770abd2a601 (diff) | |
| parent | 40aac22b43c8f9c4cc3acf625fdec3a24368ed4c (diff) | |
| download | git-8d0d53a8cf2cc0d68e396df155beba8344d7810f.zip git-8d0d53a8cf2cc0d68e396df155beba8344d7810f.tar.gz git-8d0d53a8cf2cc0d68e396df155beba8344d7810f.tar.bz2 | |
Merge branch 'sb/submodule-merge-in-merge-recursive'
Finishing touches to a topic that already is in 'master'.
* sb/submodule-merge-in-merge-recursive:
merge-submodule: reduce output verbosity
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ac27abb..5eb907f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1208,7 +1208,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 */ @@ -1220,7 +1220,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 */ |