Re: [PATCH v2] commit: restore --edit when combined with --fixup

From: Joel Klinghed <the_jk@spawned.biz>
Date: Aug 12, 2021, 07:42 UTC
Message-ID: <873ec1ab-c062-4306-b3fb-09d32c70cc7f@www.fastmail.com>
In-Reply-To: <xmqq1r6z6xwf.fsf@gitster.g>

On Thu, Aug 12, 2021, at 07:21, Junio C Hamano wrote:

Show 20 quoted lines

> "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