From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Greg Brockman <gdb@mit.edu>
Cc: git@vger.kernel.org, gitster@pobox.com, Jens.Lehmann@web.de
Subject: Re: [RFC/PATCH] git-add: Don't exclude explicitly-specified tracked files
Date: Wed, 11 Aug 2010 12:24:02 +0000 [thread overview]
Message-ID: <AANLkTikPSR36SdUuzWsXxZsy9jsKOnp=_iz43BF-6nYe@mail.gmail.com> (raw)
In-Reply-To: <1281510236-8103-1-git-send-email-gdb@mit.edu>
On Wed, Aug 11, 2010 at 07:03, Greg Brockman <gdb@mit.edu> wrote:
> Currently, 'git add' will complain about excluded files, even if they
> are already tracked:
>
> $ mkdir dir && touch dir/file && cat > .gitignore <<< dir
> $ git add -f dir/file
> $ git status
> ...
> new file: dir/file
> ...
> $ git add dir/file
> The following paths are ignored by one of your .gitignore files:
> dir
> Use -f if you really want to add them.
> fatal: no files added
>
> This commit changes 'git add' to disregard excludes for tracked files
> whose paths are explicitly specified on the command-line. So in the
> above example, 'git add dir/file' no longer requires a '-f'. However,
> 'git add dir' does.
>
> Signed-off-by: Greg Brockman <gdb@mit.edu>
> ---
> builtin/add.c | 19 +++++++++++++++++++
> 1 files changed, 19 insertions(+), 0 deletions(-)
>
> What do people think of this behavior? My motivation in writing this patch is
> that I sometimes track files in an ignored directory, and it can be cumbersome
> to remember to pass '-f' when adding them. Related commands such as 'git add -p'
> and 'git commit -a' do not require a '-f' in this case, so it feels natural to me not
> to require extra user confirmation when an explicit path has been provided.
I like it. I keep a /etc in git with .gitignore "*". This would help a
lot for use cases like that. Explicitly specifying a full path should
override gitignore IMO.
I think with some tests this should be ready to go.
next prev parent reply other threads:[~2010-08-11 12:24 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 [this message]
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
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='AANLkTikPSR36SdUuzWsXxZsy9jsKOnp=_iz43BF-6nYe@mail.gmail.com' \
--to=avarab@gmail.com \
--cc=Jens.Lehmann@web.de \
--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 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).