From: Jeff King <peff@peff.net>
To: Krzysztof Sobierajczyk <sobierajczyk.krzysztof@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: bug - git version 2.20.1.windows.1
Date: Fri, 22 Feb 2019 09:10:30 -0500 [thread overview]
Message-ID: <20190222141030.GA3272@sigill.intra.peff.net> (raw)
In-Reply-To: <CAM3o+_mX6euHa8Trq5cArcYBc9Wm0FH2L56S6Z3ojdhTcc0CWQ@mail.gmail.com>
On Fri, Feb 22, 2019 at 02:26:51PM +0100, Krzysztof Sobierajczyk wrote:
> ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
> $ git status
> On branch master
> Changes to be committed:
> (use "git reset HEAD <file>..." to unstage)
>
> renamed: to remove.txt -> new name.txt
> <------------ AND FAIL
> deleted: to rename.txt
Git doesn't store rename information; it infers it when generating a
diff (and the output from git-status here is a diff between HEAD and the
index).
If "to remove" and "to rename" contain identical data, then they are
equally valid candidates, and Git has to pick one. In this case it
picked the one you didn't expect.
-Peff
prev parent reply other threads:[~2019-02-22 14:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 13:26 bug - git version 2.20.1.windows.1 Krzysztof Sobierajczyk
2019-02-22 14:10 ` Jeff King [this message]
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=20190222141030.GA3272@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=sobierajczyk.krzysztof@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 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 NNTP newsgroup(s).