From: Jeff King <peff@peff.net>
To: Torben Hohn <torbenh@linutronix.de>
Cc: git@vger.kernel.org
Subject: Re: corner case with rename tracking and reverts
Date: Mon, 2 Jul 2012 17:07:33 -0400 [thread overview]
Message-ID: <20120702210733.GA5268@sigill.intra.peff.net> (raw)
In-Reply-To: <20120702124754.GA25882@localhost.localdomain>
On Mon, Jul 02, 2012 at 02:47:54PM +0200, Torben Hohn wrote:
> i just came over some issue, where the rename tracking got confused.
>
> I wanted to revert a commit to a moved file. But because it touched an
> empty file, this seems to have confused the rename tracking.
> (there were a few empty files there)
Yeah, it happens. When there are multiple identical sources (which
happens often with empty files), we try to disambiguate using some
heuristics on the filename, but they are not always correct.
As of v1.7.11, git will explicitly avoid auto-merging across renames of
empty files. Instead, you'll get a modify/delete conflict and be given
the opportunity to sort it out yourself.
-Peff
prev parent reply other threads:[~2012-07-02 21:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-02 12:47 corner case with rename tracking and reverts Torben Hohn
2012-07-02 21:07 ` 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=20120702210733.GA5268@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=torbenh@linutronix.de \
/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).