mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 23:53:59 +01:00
Code

Merge branch 'sb/submodule-merge-in-merge-recursive'

Browse Source 
Finishing touches to a topic that already is in 'master'.

* sb/submodule-merge-in-merge-recursive:
  merge-submodule: reduce output verbosity
This commit is contained in:
Junio C Hamano 2018-06-13 12:50:44 -07:00
commit 8d0d53a8cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -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(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
output_commit_title(o, commit_b); output_commit_title(o, commit_b);
} else if (show(o, 2)) } 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 else
; /* no output */ ; /* 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(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
output_commit_title(o, commit_a); output_commit_title(o, commit_a);
} else if (show(o, 2)) } 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 else
; /* no output */ ; /* no output */