From: Duy Nguyen <email@example.com>
To: Anthony Sottile <firstname.lastname@example.org>
Cc: Git Mailing List <email@example.com>
Subject: Re: `git reset` for delete + intent-to-add doesn't reset
Date: Tue, 8 Jan 2019 17:06:02 +0700 [thread overview]
Message-ID: <CACsJy8Bov1asw+_J_fbhKqigM==xNPi8itDGkhibkYVch4pvmQ@mail.gmail.com> (raw)
On Tue, Jan 8, 2019 at 4:44 PM Duy Nguyen <firstname.lastname@example.org> wrote:
> On Tue, Jan 8, 2019 at 2:28 PM Anthony Sottile <email@example.com> wrote:
> > ```
> > git --version
> > rm -rf t
> > git init t
> > cd t
> > touch a
> > git add a
> > git commit -m "add a"
> > git rm a
> > touch a
> > git add --intent-to-add a
> > git status --short
> > git reset -- a
> "git reset" without "-- a" does remove intent-to-add status.
No I'm wrong. But it was because I didn't follow your exact steps.
This is quite unique corner case. What happens is "git reset"
internally does "git diff --cached" basically to see what paths need
to update, then reset those paths and as a side effect, intent-to-add
status will be removed. But in this case, "a" in HEAD has empty
content, exactly the same content represented by an intent-to-add
entry. So "git diff --cached" decides there's no changes in "a", no
need to update it (so i-t-a status remains).
This can only happen if a file in HEAD is empty, which is quite
unlikely. This fix could be go through the index list the second time
just for resetting i-t-a status, but I'm not sure if it's worth doing.
prev parent reply other threads:[~2019-01-08 10:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 7:25 `git reset` for delete + intent-to-add doesn't reset Anthony Sottile
2019-01-08 7:29 ` Anthony Sottile
2019-01-08 9:44 ` Duy Nguyen
2019-01-08 10:06 ` Duy Nguyen [this message]
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: 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 \
* 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).