From: Greg Brockman <gdb@MIT.EDU>
To: Junio C Hamano <gitster@pobox.com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
git@vger.kernel.org, Jens.Lehmann@web.de
Subject: Re: [RFC/PATCH] git-add: Don't exclude explicitly-specified tracked files
Date: Thu, 12 Aug 2010 16:19:39 -0400 [thread overview]
Message-ID: <AANLkTikDvcn4eFDdkv26ADzsipwD_ofkdYwu_0abeLA3@mail.gmail.com> (raw)
In-Reply-To: <7viq3fsirv.fsf@alter.siamese.dyndns.org>
>> First of all, as you point out 'git add foo.pdf' works where foo.pdf
>> has been explicitly ignored, while in contrast 'git add dir/file'
>> fails when file has only been indirectly ignored because it is in an
>> ignored directory. In the former case, the user explicitly specified
>> a policy for that file. In the later case, the policy is only
>> indirectly expressed because that file happens to be in an ignored
>> directory.
>
> Sorry, but I don't get this argument. When the user says "everything in
> this directory is ignored", why does it make it less direct than "this
> particular file is ignored"?
In general, I view the presence of a dir entry in a .gitignore as the
user setting a default policy for files in that directory, but the
user might actually mean for there to be some exceptions to that
policy.
For example, in my personal usage, when I ignore a directory but track
some files within it, this is because I don't want to specify an
ignore for every single other file in that directory. Also note that
negated .gitignore entries don't seem to work in this case, i.e. a
.gitignore with contents
dir
!dir/file
won't actually let file be addable again.
In contrast, when I add dir/file to a .gitignore, there is no doubt
that I want to ignore that particular file.
Does that make more sense?
Greg
next prev parent reply other threads:[~2010-08-12 20:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-11 7:03 [RFC/PATCH] git-add: Don't exclude explicitly-specified tracked files Greg Brockman
2010-08-11 12:24 ` Ævar Arnfjörð Bjarmason
2010-08-11 20:50 ` Jens Lehmann
2010-08-12 2:11 ` Greg Brockman
2010-08-11 18:22 ` Junio C Hamano
2010-08-11 18:36 ` Greg Brockman
2010-08-12 2:59 ` Junio C Hamano
2010-08-12 3:19 ` Greg Brockman
2010-08-12 8:30 ` Matthieu Moy
2010-08-12 15:54 ` Greg Brockman
2010-08-12 16:31 ` Matthieu Moy
2010-08-12 20:00 ` Junio C Hamano
2010-08-12 20:19 ` Greg Brockman [this message]
2010-08-12 20:40 ` Jonathan Nieder
2010-08-12 20:26 ` Ævar Arnfjörð Bjarmason
2010-08-18 9:07 ` Greg Brockman
2010-08-18 9:29 ` [RFC/PATCH] Add test case for dealing with a tracked file in an ignored directory Greg Brockman
2010-08-18 9:43 ` Greg Brockman
2010-08-18 9:50 ` Matthieu Moy
2010-08-19 7:52 ` Greg Brockman
2010-08-19 8:50 ` Matthieu Moy
2010-08-18 13:43 ` Ævar Arnfjörð Bjarmason
2010-08-18 13:47 ` Matthieu Moy
2010-08-18 14:02 ` Ævar Arnfjörð Bjarmason
2010-08-19 0:00 ` Jonathan Nieder
2010-08-19 0:24 ` Ævar Arnfjörð Bjarmason
2010-08-25 3:13 ` Jonathan Nieder
2010-08-29 18:27 ` Ævar Arnfjörð Bjarmason
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=AANLkTikDvcn4eFDdkv26ADzsipwD_ofkdYwu_0abeLA3@mail.gmail.com \
--to=gdb@mit.edu \
--cc=Jens.Lehmann@web.de \
--cc=Matthieu.Moy@grenoble-inp.fr \
--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.
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).