Re: What's cooking in git.git (Jan 2021, #06; Sat, 30)

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 4, 2021, 01:38 UTC
Message-ID: <xmqqft2ca9yl.fsf@gitster.c.googlers.com>
In-Reply-To: <CAN7CjDC8dy4Kp=rD4rSu5pnxUAWQ=GyXmU98BsiL84H2XKbbXA@mail.gmail.com>

"Miriam R." <mirucam@gmail.com> writes:

Show 11 quoted lines

>> > I think the bisect_log still haven't added back the:
>> >
>> >       We are not bisecting
>> >
>> > as addressing in gohp6kv9bml9qc.fsf@gmail.com
>>
>> OK, I'll put it on hold and wait for a proper fix-up patch.
>>
> I have just sent the new patch series version with this and other minor fixes.
> Best,
> Miriam.

Thanks for a quick turnaround.  Queued and pushed out.

I think the change, especially to the first one, covers the above comment sufficiently.

1:  7766d1f8a8 ! 1:  97d5ba6a39 bisect--helper: reimplement `bisect_log` shell function in C
    @@ Commit message
         Mentored-by: Lars Schneider <larsxschneider@gmail.com>
         Mentored-by: Christian Couder <chriscool@tuxfamily.org>
         Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    +    Helped-by: Rafael Silva <rafaeloliveira.cs@gmail.com>
         Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
         Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
         Signed-off-by: Miriam Rubio <mirucam@gmail.com>
    @@ builtin/bisect--helper.c: static enum bisect_error bisect_state(struct bisect_te
     +static enum bisect_error bisect_log(void)
     +{
     +	int fd, status;
    -+	fd = open(git_path_bisect_log(), O_RDONLY);
    ++	const char* filename = git_path_bisect_log();
    ++
    ++	if (is_empty_or_missing_file(filename))
    ++		return error(_("We are not bisecting."));
    ++
    ++	fd = open(filename, O_RDONLY);
     +	if (fd < 0)
     +		return BISECT_FAILED;
     +