This rerolls the two commits found at [1] with the feedback of Eliah and puts Leifs patch[2] on top, that I edited according to Eliahs feedback, but kept Leifs ownership.
This has addressed all of Eliahs feedback AFAICT. You'll find a branch-diff below[3], which lacks the new patch of Leif in that series, but is part of the reroll? Leif, what do you think? Thanks, Stefan [1] https://public-inbox.org/git/20180510211917.138518-1-sbel...@google.com/ [2] https://public-inbox.org/git/20180514205737.21313-2-leif.middelschu...@gmail.com/ [3] git branch-diff origin/master..origin/sb/submodule-merge-in-merge-recursive origin/master..HEAD >>0000-cover-letter.patch Leif Middelschulte (1): Inform about fast-forwarding of submodules during merge Stefan Beller (2): submodule.c: move submodule merging to merge-recursive.c merge-recursive: i18n submodule merge output and respect verbosity merge-recursive.c | 185 +++++++++++++++++++++++++++++++++++++++++++++- submodule.c | 168 +---------------------------------------- submodule.h | 6 +- 3 files changed, 186 insertions(+), 173 deletions(-) -- 2.17.0.582.gccdcbd54c44.dirty 1: e022c7976ae ! 1: 3b638ccac64 submodule.c: move submodule merging to merge-recursive.c @@ -20,7 +20,6 @@ This commit is best viewed with --color-moved. Signed-off-by: Stefan Beller <sbel...@google.com> - Signed-off-by: Junio C Hamano <gits...@pobox.com> diff --git a/merge-recursive.c b/merge-recursive.c --- a/merge-recursive.c 2: 2c02ece7e01 ! 2: eb43110df9d merge-recursive: i18n submodule merge output and respect verbosity @@ -7,7 +7,6 @@ internationalisation as well as the verbosity setting. Signed-off-by: Stefan Beller <sbel...@google.com> - Signed-off-by: Junio C Hamano <gits...@pobox.com> diff --git a/merge-recursive.c b/merge-recursive.c --- a/merge-recursive.c @@ -73,10 +72,10 @@ - fprintf(stderr, "Found a possible merge resolution " - "for the submodule:\n"); + output(o, 1, _("Failed to merge submodule %s (not fast-forward)"), path); -+ output(o, 1, _("Found a possible merge resolution for the submodule:\n")); ++ output(o, 2, _("Found a possible merge resolution for the submodule:\n")); print_commit((struct commit *) merges.objects[0].item); - fprintf(stderr, -+ output(o, 1, _( ++ output(o, 2, _( "If this is correct simply add it to the index " "for example\n" "by using:\n\n" -: ----------- > 3: 4a3bc435023 Inform about fast-forwarding of submodules during merge
