From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: gitgitgadget@gmail.com, Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/3] rebase --rebase-merges: add support for octopus merges
Date: Thu, 12 Jul 2018 15:08:33 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1807121503220.75@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CAPig+cS1KQseynMCGC_6FZwzB0waJX8+C7CVKNqACzOhjB4uSg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2962 bytes --]
Hi Eric,
On Wed, 11 Jul 2018, Eric Sunshine wrote:
> On Wed, Jul 11, 2018 at 8:38 AM Johannes Schindelin via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> > diff --git a/sequencer.c b/sequencer.c
> > @@ -2932,7 +2966,8 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
> > - strbuf_addf(&buf, "Merge branch '%.*s'",
> > + strbuf_addf(&buf, "Merge %s '%.*s'",
> > + to_merge->next ? "branches" : "branch",
>
> Error messages in this file are already localizable. If this text ever
> becomes localizable, then this "sentence lego" could be problematic
> for translators.
As pointed out by Junio, this is not really a message eligible for
localization, at least not right now. If it becomes localized later, it
will be very easy to change the sentence lego then.
I am just wary of making life harder for the compiler that wants to verify
that the printf() style parameters match the format.
> > @@ -2956,28 +2991,76 @@ static int do_merge(struct commit *commit, const char *arg, int arg_len,
> > + cmd.git_cmd = 1;
> > + argv_array_push(&cmd.args, "merge");
> > + argv_array_push(&cmd.args, "-s");
> > + argv_array_push(&cmd.args, "octopus");
>
> argv_array_pushl(&cmd.args, "-s", "octopus", NULL);
>
> which would make it clear that these two arguments must remain
> together, and prevent someone from coming along and inserting a new
> argument between them.
I use a single `argv_array_pushl()` call now, with intuitive line
wrapping.
> > + argv_array_push(&cmd.args, "--no-edit");
> > + argv_array_push(&cmd.args, "--no-ff");
> > + argv_array_push(&cmd.args, "--no-log");
> > + argv_array_push(&cmd.args, "--no-stat");
> > + argv_array_push(&cmd.args, "-F");
> > + argv_array_push(&cmd.args, git_path_merge_msg());
>
> Ditto:
> argv_array_pushl(&cmd.args, "-L", git_path_merge_msg(), NULL);
>
> > diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
> > @@ -329,4 +329,38 @@ test_expect_success 'labels that are object IDs are rewritten' '
> > +test_expect_success 'octopus merges' '
> > + git checkout -b three &&
> > + test_commit before-octopus &&
> > + test_commit three &&
> > + git checkout -b two HEAD^ &&
> > + test_commit two &&
> > + git checkout -b one HEAD^ &&
> > + test_commit one &&
> > + test_tick &&
> > + (GIT_AUTHOR_NAME="Hank" GIT_AUTHOR_EMAIL="hank@sea.world" \
> > + git merge -m "Tüntenfüsch" two three) &&
>
> Unnecessary subshell?
Yes, I agree. I don't recall why I did it that way, probably I tried
something else originally that required a subshell, or something.
Thank you for helping me make the patches better.
Ciao,
Dscho
next prev parent reply other threads:[~2018-07-12 13:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 12:38 [PATCH 0/3] rebase -r: support octopus merges Johannes Schindelin via GitGitGadget
2017-12-21 14:52 ` [PATCH 2/3] rebase --rebase-merges: add support for " Johannes Schindelin via GitGitGadget
2018-07-11 18:49 ` Eric Sunshine
2018-07-11 21:52 ` Junio C Hamano
2018-07-12 13:11 ` Johannes Schindelin
2018-07-12 13:08 ` Johannes Schindelin [this message]
2017-12-22 14:10 ` [PATCH 1/3] merge: allow reading the merge commit message from a file Johannes Schindelin via GitGitGadget
2018-07-11 22:06 ` Junio C Hamano
2018-07-12 12:58 ` Johannes Schindelin
2018-07-12 16:20 ` Junio C Hamano
2018-03-09 16:36 ` [PATCH 3/3] rebase --rebase-merges: adjust man page for octopus support Johannes Schindelin via GitGitGadget
2018-07-11 17:05 ` Elijah Newren
2018-07-12 12:48 ` Johannes Schindelin
2018-07-11 17:35 ` [PATCH 0/3] rebase -r: support octopus merges Junio C Hamano
2018-07-11 17:47 ` Stefan Beller
2018-07-12 12:54 ` Johannes Schindelin
2018-07-12 16:26 ` Junio C Hamano
2018-07-13 16:42 ` Johannes Sixt
2018-07-16 17:56 ` Junio C Hamano
2018-07-12 12:49 ` Johannes Schindelin
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=nycvar.QRO.7.76.6.1807121503220.75@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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).