Re: [PATCH] stash: fix handling removed files with --keep-index

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 16, 2019, 20:08 UTC
Message-ID: <xmqqblxt3fpb.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190716133501.GG15477@hank.intra.tgummerer.com>

Thomas Gummerer <t.gummerer@gmail.com> writes:

Show 14 quoted lines

> On 07/11, Junio C Hamano wrote:
>> Thomas Gummerer <t.gummerer@gmail.com> writes:
>> 
>> > Fix that behaviour by using 'git restore' which can faithfully restore
>> > the index and working tree.  This also simplifies the code.
>> 
>> Hmph.  I would have preferred to see we stayed away from 'restore'
>> (and used 'checkout' instead, if you must use a Porcelain command),
>> so that the "fix" can go to maintenance tracks, if distro packagers
>> choose to backport it.
>
> Fair enough.  I thought this wouldn't even go to 'maint', since the
> bug exists since a while, so 'git restore' would be fine, but didn't
> think of distro packagers.  I'm happy to use 'checkout' here instead.

As long as the "--no-overlay" option is used, it is not much better. Backporting the fix goes only back to 2.22 and no earlier.