Re: [PATCH] checkout.c: unstage empty deleted ita files

From: Jeff King <peff@peff.net>
Date: Jul 29, 2019, 09:11 UTC
Message-ID: <20190729091146.GA1595@sigill.intra.peff.net>
In-Reply-To: <CAK_rgsH6hL3g+PVfcMuq1dQLeNJcii=D_dQ8anmWLvYrShmkNg@mail.gmail.com>

On Sun, Jul 28, 2019 at 11:54:38PM -0700, Varun Naik wrote:

> > These two paragraphs would be a nice addition to the actual commit
> > message.
> 
> I will add them to the commit message, with some minor changes.

Thanks!

Show 11 quoted lines

> > Hmm. This git-restore test means we don't apply to maint. But wouldn't
> > we want the fix for "checkout" there?
> >
> > I.e., I'd expect a patch to fix and test git-checkout, and then an
> > additional patch to be added on the merge of that plus master to test
> > git-restore.
> >
> 
> To make sure I understand, do you mean that I should omit the test
> case for "restore" right now, wait for the patch to reach master, and
> then create another patch for the "restore" test case?

I think we could do it all right now. If you split it into two patches, one for "fix checkout" and another for "add restore tests", then Junio could do something like:

  git checkout -b vn/checkout-ita maint
  git am fix-checkout.patch

  git checkout -b vn/restore-ita-tests master
  git merge vn/checkout-ita
  git am restore-tests.patch

The justification for the commit message in the latter patch is something like "this is fixed already, but let's add a regression test to make sure it remains fixed".

-Peff