From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 19 Dec 2020 17:34:07 GMT
Subject: Re: [PATCH] checkout -p: handle tree arguments correctly again
Message-ID: <xmqqczz5punk.fsf@gitster.c.googlers.com>
In-Reply-To: <X94WHmY3Cd30wqan@generichostname>

Denton Liu <liu.denton@gmail.com> writes:

> Hi Dscho,
>
> On Sat, Dec 19, 2020 at 02:55:59PM +0000, Johannes Schindelin via GitGitGadget wrote:
>> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>> 
>> This fixes a segmentation fault.
>> 
>> The bug is caused by dereferencing `new_branch_info->commit` when it is
>> `NULL`, which is the case when the tree-ish argument is actually a tree,
>> not a commit-ish. This was introduced in 5602b500c3c (builtin/checkout:
>> fix `git checkout -p HEAD...` bug, 2020-10-07), where we tried to ensure
>> that the special tree-ish `HEAD...` is handled correctly.
>> 
>> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> Argh, thanks for catching this. The patch looks obviously good.
>
> Since I'm the one who introduced the bug in the first place:
>
> 	Acked-by: Denton Liu <liu.denton@gmail.com>

The fix looks obviously correct to me.  Thanks, both.

Will queue for fast-tracking.