git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Raymond E. Pasco" <ray@ameretat.dev>
To: "Another Email" <yetanotheroneemail@gmail.com>, <git@vger.kernel.org>
Subject: Re: Issue when adding new files to staged changes using interactive mode
Date: Wed, 29 Jul 2020 14:58:09 -0400	[thread overview]
Message-ID: <C4JC6LFSAFFS.2U4ZZ9ZMO066A@ziyou.local> (raw)
In-Reply-To: <5BDF4B85-7AC1-495F-85C3-D429E3E51106@gmail.com>

This is introduced in commit feea6946a5b746ff4ebf8ccdf959e303203a6011
(diff-files: treat "i-t-a" files as "not-in-index"). I guess this leads
to add-patch skipping directly to attempting to apply the hunk, rather
than trying to combine it with what's already in the index, and apply
--check --cached correctly reports that it's already in the index.

I'm looking at add-patch.c but it's not immediately obvious to me how it
handles already-staged changes, so I don't have a proposed patch.

  reply	other threads:[~2020-07-29 20:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-28 23:10 Issue when adding new files to staged changes using interactive mode Another Email
2020-07-29 18:58 ` Raymond E. Pasco [this message]
2020-07-29 21:30   ` Raymond E. Pasco
2020-07-29 22:33     ` Another Email
2020-07-31 19:51 ` Taylor Blau

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=C4JC6LFSAFFS.2U4ZZ9ZMO066A@ziyou.local \
    --to=ray@ameretat.dev \
    --cc=git@vger.kernel.org \
    --cc=yetanotheroneemail@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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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