From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: jpinheiro <7jpinheiro@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 3/3] t3600: test rm of path with changed leading symlinks
Date: Fri, 5 Apr 2013 01:04:24 -0400 [thread overview]
Message-ID: <20130405050424.GA30533@sigill.intra.peff.net> (raw)
In-Reply-To: <7vsj35efne.fsf@alter.siamese.dyndns.org>
On Thu, Apr 04, 2013 at 09:59:49PM -0700, Junio C Hamano wrote:
> > That means the worst case is not the accidental loss of content,
> > but rather confusion by the user when a copy of a file another
> > part of the tree is removed.
>
> A copy of a file that is on the filesystem that may not be related
> to the project at all may be lost, and the user may not notice the
> lossage for quite a while. A symlink that points at /etc/passwd may
> cause the file to be removed and the user will hopefully notice, but
> if the pointed-at file is something in $HOME/tmp/ that you occasionally
> use, you may not notice the lossage immediately, and when you notice
> the loss, the only assurance you have is that there is a blob that
> records what was lost _somewhere_ in _some_ of your project that had
> a symlink that points at $HOME/tmp/ at some point in the past.
It's actually quite hard to lose those files. We will only remove the
file if it has a matching index entry. So you cannot do:
ln -s /etc foo
git rm foo/passwd
because there is no index entry for foo/passwd. You would have to do:
mkdir foo
echo content >foo/passwd
git add foo/passwd
rm -rf foo
ln -s /etc foo
git rm foo/passwd
and then you only lose it if it matches exactly "content". And
recovering it, you know that the original path that held the content was
called "passwd". So yes, technically you could lose a file outside of
the repo and have trouble finding which path it came from later. But in
practice, not really.
Anyway, it is academic at this point. :)
-Peff
prev parent reply other threads:[~2013-04-05 5:05 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
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 [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=20130405050424.GA30533@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=7jpinheiro@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).