mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <>
To: Varun Naik <>
Cc: Junio C Hamano <>,
Subject: Re: [PATCH] checkout.c: unstage empty deleted ita files
Date: Mon, 29 Jul 2019 05:11:47 -0400	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

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.


> > 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".


  reply	other threads:[~2019-07-29  9:11 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-26  4:56 [PATCH] checkout.c: unstage empty deleted ita files Varun Naik
2019-07-26  5:01 ` Varun Naik
2019-07-26  8:57 ` Jeff King
2019-07-29  6:54   ` Varun Naik
2019-07-29  9:11     ` Jeff King [this message]
2019-08-01 16:07 ` [PATCH v2] " Varun Naik
2019-08-01 17:34   ` Junio C Hamano
2019-08-01 21:51   ` Jeff King
2019-08-01 16:09 ` [PATCH] restore: add test for " Varun Naik
2019-08-02 16:16   ` Junio C Hamano
2019-08-02 16:28 ` [PATCH v3] checkout.c: unstage empty " Varun Naik

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).