All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Greg Brockman <gdb@MIT.EDU>
Cc: Junio C Hamano <gitster@pobox.com>,
	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 15:40:52 -0500	[thread overview]
Message-ID: <20100812204051.GF2029@burratino> (raw)
In-Reply-To: <AANLkTikDvcn4eFDdkv26ADzsipwD_ofkdYwu_0abeLA3@mail.gmail.com>

Greg Brockman wrote:

> 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.

Aside: yeah, this is something I have run into before.  The workaround
I used was to use a dir/.gitignore instead, like this:

 *
 !/file

which is ugly.

Maybe git should get internal support for something like

 dir/**

(meaning “all files under dir”) and “!dir/file” could be internally
munged to

 !/dir
 dir/**
 !dir/file

when it appears after “dir”.

  reply	other threads:[~2010-08-12 20:42 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
2010-08-12 20:40         ` Jonathan Nieder [this message]
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100812204051.GF2029@burratino \
    --to=jrnieder@gmail.com \
    --cc=Jens.Lehmann@web.de \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=gdb@MIT.EDU \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.