From: Junio C Hamano <gitster@pobox.com>
To: "Philip Oakley" <philipoakley@iee.org>
Cc: "Johannes Sixt" <j.sixt@viscovery.net>,
"Taylor Hedberg" <tmhedberg@gmail.com>,
"Bertrand BENOIT" <projettwk@users.sourceforge.net>,
<git@vger.kernel.org>
Subject: Re: [PATCH] Add test that checkout does not overwrite entries in .git/info/exclude
Date: Sun, 20 Nov 2011 23:59:23 -0800 [thread overview]
Message-ID: <7vobw5hpno.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <00392567F0B045E38A429F95594C1BD2@PhilipOakley> (Philip Oakley's message of "Mon, 21 Nov 2011 07:45:01 -0000")
"Philip Oakley" <philipoakley@iee.org> writes:
> Shouldn't there be some documentation changes to support this very
> useful feature.
I do not agree it is "useful", if it is info/exclude only, which by design
would not propagate across repositories and histories.
If we were to support "precious" as a feature, we should do that properly
with a properly defined syntax (e.g. just like '!' prefix is "no, this is
not 'ignored' entry", use some prefix to say "well, this is ignored in the
sense that not to be tracked, but that does not mean this can be nuked")
that can be in any exclude sources.
Exclude patterns in info/exclude should work just like ones in the in-tree
.gitignore only at different precedence for uniformity and consistency, so
the behaviour J6t showed in the new test should be fixed.
The entries in info/exclude are at lower priority than the ones in in-tree
.gitignore files, which probably was a design mistake, but that is a
separate issue.
next prev parent reply other threads:[~2011-11-21 7:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-20 13:42 Bug report - local (and git ignored) file silently removed after checkout Bertrand BENOIT
2011-11-20 21:16 ` Junio C Hamano
2011-11-20 22:19 ` Taylor Hedberg
2011-11-21 3:36 ` Junio C Hamano
2011-11-21 7:23 ` [PATCH] Add test that checkout does not overwrite entries in .git/info/exclude Johannes Sixt
2011-11-21 7:45 ` Philip Oakley
2011-11-21 7:59 ` Junio C Hamano [this message]
2011-11-21 7:50 ` Junio C Hamano
2011-11-21 8:52 ` Nguyen Thai Ngoc Duy
2011-11-21 17:27 ` Junio C Hamano
2011-11-23 11:31 ` Nguyen Thai Ngoc Duy
2011-11-21 8:17 ` Nguyen Thai Ngoc Duy
2011-11-21 15:18 ` Junio C Hamano
2011-11-21 15:44 ` Bertrand BENOIT
2011-11-23 11:40 ` Nguyen Thai Ngoc Duy
2011-11-23 17:16 ` Junio C Hamano
2011-11-24 1:35 ` Nguyen Thai Ngoc Duy
2011-11-24 5:17 ` Junio C Hamano
2011-11-24 5:39 ` Nguyen Thai Ngoc Duy
2011-11-27 10:13 ` Nguyen Thai Ngoc Duy
2011-11-27 10:15 ` [PATCH 1/2] checkout,merge: loosen overwriting untracked file check based on info/exclude Nguyễn Thái Ngọc Duy
2011-11-27 10:15 ` [PATCH 2/2] checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore Nguyễn Thái Ngọc Duy
2011-11-29 18:17 ` [PATCH 1/2] checkout,merge: loosen overwriting untracked file check based on info/exclude Junio C Hamano
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
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 \
--in-reply-to=7vobw5hpno.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=philipoakley@iee.org \
--cc=projettwk@users.sourceforge.net \
--cc=tmhedberg@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).