From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, leif.middelschulte@gmail.com
Cc: gitster@pobox.com, newren@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCHv2 0/3] Reroll of sb/submodule-merge-in-merge-recursive
Date: Tue, 15 May 2018 13:00:25 -0700 [thread overview]
Message-ID: <20180515200030.88731-1-sbeller@google.com> (raw)
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-sbeller@google.com/
[2] https://public-inbox.org/git/20180514205737.21313-2-leif.middelschulte@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 <sbeller@google.com>
- Signed-off-by: Junio C Hamano <gitster@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 <sbeller@google.com>
- Signed-off-by: Junio C Hamano <gitster@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
next reply other threads:[~2018-05-15 20:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 20:00 Stefan Beller [this message]
2018-05-15 20:00 ` [PATCH] git-submodule.sh: try harder to fetch a submodule Stefan Beller
2018-05-15 20:00 ` [PATCH] grep: handle corrupt index files early Stefan Beller
2018-05-15 20:00 ` [PATCH 1/3] submodule.c: move submodule merging to merge-recursive.c Stefan Beller
2018-05-15 20:00 ` [PATCH 2/3] merge-recursive: i18n submodule merge output and respect verbosity Stefan Beller
2018-05-16 1:17 ` Junio C Hamano
2018-05-15 20:00 ` [PATCH 3/3] Inform about fast-forwarding of submodules during merge Stefan Beller
2018-05-16 1:36 ` Elijah Newren
2018-05-16 1:36 ` Junio C Hamano
2018-05-16 1:42 ` Junio C Hamano
2018-06-04 18:48 ` [PATCH v4 0/1] merge-recursive: give notice when submodule commit gets fast-forwarded Leif Middelschulte
2018-06-04 18:48 ` [PATCH 1/1] " Leif Middelschulte
2018-06-07 5:22 ` Elijah Newren
2018-06-11 17:31 ` [PATCH] merge-submodule: reduce output verbosity Leif Middelschulte
2018-06-11 18:04 ` Junio C Hamano
2018-06-11 19:07 ` Leif Middelschulte
2018-05-15 20:02 ` [PATCHv2 0/3] Reroll of sb/submodule-merge-in-merge-recursive Stefan Beller
2018-05-15 20:15 ` Leif Middelschulte
2018-05-15 20:49 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180515200030.88731-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=leif.middelschulte@gmail.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).