From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: jpinheiro <7jpinheiro@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 3/3] t3600: test rm of path with changed leading symlinks
Date: Thu, 04 Apr 2013 13:31:43 -0700 [thread overview]
Message-ID: <7v1uaqhwb4.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130404195554.GA20823@sigill.intra.peff.net> (Jeff King's message of "Thu, 4 Apr 2013 15:55:54 -0400")
Jeff King <peff@peff.net> writes:
>> If you do this:
>>
>> rm -fr d e
>> mkdir e
>> >e/f
>> ln -s e d
>> git add d/f
>>
>> we do complain that d/f is beyond a symlink (meaning that all you
>> can add is the symlink d that may happen to point at something).
>
> Right, but that is because you are adding a bogus entry to the index; we
> cannot have both 'd' as a symlink and 'd/f' as a path in our git tree.
> But in the removal case, the index manipulation is perfectly reasonable.
I think you misread me. I am not adding 'd' as a symlink at all.
IIRC, ancient versions of Git got this case wrong and added d/f to
the index, which we later fixed.
I have been hinting that we should do the same safety not to touch
(even compare the contents of) e/f, because the only reason we even
look at it is because it appears beyond a symbolic link 'd'.
next prev parent reply other threads:[~2013-04-04 20:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-03 14:50 Behavior of git rm jpinheiro
2013-04-03 15:58 ` Jeff King
2013-04-03 17:35 ` Junio C Hamano
2013-04-03 20:36 ` Jeff King
2013-04-04 19:02 ` Jeff King
2013-04-04 19:03 ` [PATCH 1/3] rm: do not complain about d/f conflicts during deletion Jeff King
2013-04-04 19:03 ` [PATCH 2/3] t3600: test behavior of reverse-d/f conflict Jeff King
2013-04-04 19:06 ` [PATCH 3/3] t3600: test rm of path with changed leading symlinks Jeff King
2013-04-04 19:42 ` Junio C Hamano
2013-04-04 19:55 ` Jeff King
2013-04-04 20:31 ` Junio C Hamano [this message]
2013-04-04 21:03 ` Jeff King
2013-04-04 23:12 ` Junio C Hamano
2013-04-04 23:29 ` Jeff King
2013-04-04 23:33 ` Junio C Hamano
2013-04-05 0:00 ` Jeff King
2013-04-05 4:59 ` Junio C Hamano
2013-04-05 5:04 ` Jeff King
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=7v1uaqhwb4.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=7jpinheiro@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).