From: Adam Piatyszek <ediap@users.sourceforge.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
pradeep singh rautela <rautelap@gmail.com>,
git@vger.kernel.org
Subject: Re: Why does git track directory listed in .gitignore/".git/info/exclude"?
Date: Thu, 31 Jan 2008 08:05:34 +0100 [thread overview]
Message-ID: <47A1733E.9040103@users.sourceforge.net> (raw)
In-Reply-To: <7vprvjgi9v.fsf@gitster.siamese.dyndns.org>
Hi Junio,
* Junio C Hamano [30 I 2008 21:39]:
> When you say "foo", you mean "I want either 'foo' that is a
> non-directory, or everything under 'foo' if that is a
> directory". When you say "foo/", you are saying "I do not want
> 'foo' if it is a non-directory. I want everything under 'foo'
> if and only if that is a directory". Compare:
>
> git ls-files -s Makefile/
> git ls-files -s Makefile
>
> The first one is silent, and the latter answers. On the other
> hand, for a directory, both of these give you the same:
>
> git ls-files Documentation/
> git ls-files Documentation
>
As you said above both "Documentation/" and "Documentation" match the
existing tracked directory named "Documentation". That is how ls-files
works and it is the only sane way. The problem is that I expect that
directory entries ending with "/" in .gitignore and .git/info/exclude
files are treated in a similar way, i.e. they are being _ignored_ with
all the stuff in them, in the same way as directory entries without the
ending slash. Unfortunately this is not the case. See this example:
ediap@lespaul ~/tmp $ mkdir repo && cd repo
ediap@lespaul ~/tmp/repo $ git init
Initialized empty Git repository in .git/
ediap@lespaul ~/tmp/repo $ touch a.txt
ediap@lespaul ~/tmp/repo $ git add a.txt
ediap@lespaul ~/tmp/repo $ git commit -m "a file"
Created initial commit 1712595: a file
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 a.txt
ediap@lespaul ~/tmp/repo $ mkdir d
ediap@lespaul ~/tmp/repo $ touch d/b.txt
ediap@lespaul ~/tmp/repo $ git status
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# d/
nothing added to commit but untracked files present (use "git add" to track)
ediap@lespaul ~/tmp/repo $ echo "d/" > .gitignore
ediap@lespaul ~/tmp/repo $ git add .gitignore
ediap@lespaul ~/tmp/repo $ git commit -m "ignore"
Created commit 29ebf4d: ignore
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 .gitignore
ediap@lespaul ~/tmp/repo $ git status
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# d/
nothing added to commit but untracked files present (use "git add" to track)
But:
ediap@lespaul ~/tmp/repo $ echo "d" > .gitignore
ediap@lespaul ~/tmp/repo $ git add .gitignore
ediap@lespaul ~/tmp/repo $ git commit --amend -m "ignore"
Created commit 43198d4: ignore
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 .gitignore
ediap@lespaul ~/tmp/repo $ git status
# On branch master
nothing to commit (working directory clean)
I hope you now understand what I was trying to express in my previous
email. :-)
BR,
/Adam
--
.:. Adam Piatyszek (ediap) .:.....................................:.
.:. ediap@users.sourceforge.net .:................................:.
next prev parent reply other threads:[~2008-01-31 7:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-23 13:54 Why does git track directory listed in .gitignore/".git/info/exclude"? pradeep singh rautela
2008-01-23 14:04 ` pradeep singh rautela
2008-01-23 21:17 ` Linus Torvalds
2008-01-24 10:44 ` pradeep singh rautela
2008-01-30 12:35 ` Adam Piatyszek
2008-01-30 20:39 ` Junio C Hamano
2008-01-30 21:06 ` Junio C Hamano
2008-01-31 7:05 ` Adam Piatyszek [this message]
2008-01-31 8:54 ` *Re: " Junio C Hamano
2008-01-31 9:17 ` [PATCH] gitignore(5): Allow "foo/" in ignore list to match directory "foo" Junio C Hamano
2008-01-31 9:41 ` Jeff King
2008-01-31 10:35 ` Junio C Hamano
2008-01-31 10:42 ` Jeff King
2008-01-31 11:38 ` Johannes Schindelin
2008-01-31 11:56 ` pradeep singh rautela
2008-01-31 21:51 ` Junio C Hamano
2008-01-31 22:53 ` Adam Piatyszek
2008-02-01 8:56 ` Andreas Ericsson
2008-01-31 12:29 ` Adam Piatyszek
2008-01-23 21:11 ` Why does git track directory listed in .gitignore/".git/info/exclude"? Wayne Davison
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=47A1733E.9040103@users.sourceforge.net \
--to=ediap@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rautelap@gmail.com \
--cc=torvalds@linux-foundation.org \
/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).