From: Junio C Hamano <gitster@pobox.com>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: Martin Nicolay <m.nicolay@osm-ag.de>, git@vger.kernel.org
Subject: Re: [PATCH] stash: fix handling removed files with --keep-index
Date: Tue, 16 Jul 2019 13:08:32 -0700 [thread overview]
Message-ID: <xmqqblxt3fpb.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190716133501.GG15477@hank.intra.tgummerer.com> (Thomas Gummerer's message of "Tue, 16 Jul 2019 14:35:01 +0100")
Thomas Gummerer <t.gummerer@gmail.com> writes:
> 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.
next prev parent reply other threads:[~2019-07-16 20:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 12:55 Bug with deleted files and stash-push --keep-idex Martin Nicolay
2019-07-11 17:48 ` [PATCH] stash: fix handling removed files with --keep-index Thomas Gummerer
2019-07-11 21:23 ` Junio C Hamano
2019-07-16 13:35 ` Thomas Gummerer
2019-07-16 20:08 ` Junio C Hamano [this message]
2019-07-16 14:23 ` [PATCH v2] " Thomas Gummerer
2019-07-16 20:08 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqblxt3fpb.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=m.nicolay@osm-ag.de \
--cc=t.gummerer@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.