From: Philippe Blain <philippe.blain@me.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 0/1] worktree: teach "add" to ignore submodule.recurse config
Date: Tue, 29 Oct 2019 08:33:21 -0400 [thread overview]
Message-ID: <85CAC41A-A0EA-4E22-BC22-F57A59D76678@me.com> (raw)
In-Reply-To: <xmqqtv7ta9lz.fsf@gitster-ct.c.googlers.com>
Hi Junio,
That indeed makes the trick. Thanks!
Should I send a separate patch series with this patch ? How would that work ? "Signed-off by" me and "Based-on-patch-by" you ?
Philippe.
> Le 27 oct. 2019 à 22:26, Junio C Hamano <gitster@pobox.com> a écrit :
>
> I am not sure if the compiler needs fixing in this case, but the
> following may work it around.
>
> builtin/merge.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index e2ccbc44e2..0746f11df2 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -826,9 +826,12 @@ static void prepare_to_commit(struct commit_list *remoteheads)
> strbuf_commented_addf(&msg, "\n");
> }
> strbuf_commented_addf(&msg, _(merge_editor_comment));
> - strbuf_commented_addf(&msg, _(cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS ?
> - scissors_editor_comment :
> - no_scissors_editor_comment), comment_line_char);
> +
> + if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
> + strbuf_commented_addf(&msg, _(scissors_editor_comment));
> + else
> + strbuf_commented_addf(&msg, _(no_scissors_editor_comment),
> + comment_line_char);
> }
> if (signoff)
> append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
next prev parent reply other threads:[~2019-10-29 12:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 17:16 [PATCH 0/1] worktree: teach "add" to ignore submodule.recurse config Philippe Blain via GitGitGadget
2019-10-27 17:16 ` [PATCH 1/1] " Philippe Blain via GitGitGadget
2019-10-28 2:26 ` [PATCH 0/1] " Junio C Hamano
2019-10-29 12:33 ` Philippe Blain [this message]
2019-10-30 1:01 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=85CAC41A-A0EA-4E22-BC22-F57A59D76678@me.com \
--to=philippe.blain@me.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).