From: "Joel Klinghed" <the_jk@spawned.biz>
To: "Junio C Hamano" <gitster@pobox.com>,
"Joel Klinghed via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Jeff King" <peff@peff.net>,
"brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH v2] commit: restore --edit when combined with --fixup
Date: Thu, 12 Aug 2021 09:42:06 +0200 [thread overview]
Message-ID: <873ec1ab-c062-4306-b3fb-09d32c70cc7f@www.fastmail.com> (raw)
In-Reply-To: <xmqq1r6z6xwf.fsf@gitster.g>
On Thu, Aug 12, 2021, at 07:21, Junio C Hamano wrote:
> "Joel Klinghed via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > diff --git a/builtin/commit.c b/builtin/commit.c
> > index 190d215d43b..4c5286840c5 100644
> > --- a/builtin/commit.c
> > +++ b/builtin/commit.c
> > @@ -1333,7 +1333,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
> > } else {
> > fixup_commit = fixup_message;
> > fixup_prefix = "fixup";
> > - use_editor = 0;
> > + if (0 > edit_flag)
>
> Writing this as
>
> if (edit_flag < 0)
>
> makes it far easier to immediately see that we are talking about a
> nagetive edit_flag.
>
Agree, I'll change it.
I was unsure of the style and copied from the earlier condition:
if (0 <= edit_flag)
use_editor = edit_flag;
> > + use_editor = 0;
> > }
> > }
> >
>
> Use write_script helper from test-lib-functions.sh here and lose the
> hardcoded reference to /bin/sh.
>
Ah, missed that one.
Thanks.
/JK
next prev parent reply other threads:[~2021-08-12 7:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 13:49 [PATCH] commit: restore --edit when combined with --fixup Joel Klinghed via GitGitGadget
2021-08-11 20:24 ` Jeff King
2021-08-11 22:10 ` Joel Klinghed
2021-08-11 22:22 ` Jeff King
2021-08-11 23:27 ` brian m. carlson
2021-08-11 23:43 ` [PATCH v2] " Joel Klinghed via GitGitGadget
2021-08-12 5:21 ` Junio C Hamano
2021-08-12 7:42 ` Joel Klinghed [this message]
2021-08-12 19:51 ` Junio C Hamano
2021-08-12 8:02 ` [PATCH v3] " Joel Klinghed via GitGitGadget
2021-08-12 9:32 ` Phillip Wood
2021-08-12 10:01 ` Joel Klinghed
2021-08-13 13:06 ` Phillip Wood
2021-08-13 15:35 ` Joel Klinghed
2021-08-14 15:20 ` Phillip Wood
2021-08-14 21:19 ` Joel Klinghed
2021-08-12 11:55 ` [PATCH v4] " Joel Klinghed via GitGitGadget
2021-08-14 21:40 ` [PATCH v5] " Joel Klinghed via GitGitGadget
2021-08-17 10:06 ` Phillip Wood
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=873ec1ab-c062-4306-b3fb-09d32c70cc7f@www.fastmail.com \
--to=the_jk@spawned.biz \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/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).