2006/5/17, Alex Riesen <raa.lkml@xxxxxxxxx>:
On 5/17/06, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
> >
> > It's consistent from an implementation point of view, but not from the
> > (my?) user point of view.
>
> So, you told git to ignore the file. And then you say "please add it". I
> find it highly consistent that git does not do anything, because *you*
> decided it should ignore it in the first place.
>
Well, he didn't say to ignore exactly this file. And Santi didn't know
git-add uses git-ls-files here. So it actually is unexpected for a novice.
It was unexpected for me too, until I looked into git-add.sh
Actually I'm not a novice, but that is the point.
In the other way, now I find the value of being able to say:
$ git add t*
and be sure that it does not add an ignored file. Unfortunately
git-add cannot distinguish between both. So what I propose is to
document it explicitly, something like:
diff --git a/Documentation/git-add.txt /Documentation/git-add.txt
index 5e31129..42f1e33 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -7,18 +7,20 @@ git-add - Add files to the index file
SYNOPSIS
--------
-'git-add' [-n] [-v] [--] <file>...
+'git-add' [-n] [-v] [--] <filespec>...
DESCRIPTION
-----------
A simple wrapper for git-update-index to add files to the index,
for people used to do "cvs add".
+It only adds non-ignored files, to add ignored files use
+"git-update-index --add".
OPTIONS
-------
-<file>...::
- Files to add to the index.
+<filespec>...::
+ Files to add to the index (see git-ls-files).
-n::
Don't actually add the file(s), just show if they exist.
diff --git a/git-add.sh b/git-add.sh
index d6a4bc7..394793f 100755
--- a/git-add.sh
+++ b/git-add.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-USAGE='[-n] [-v] <file>...'
+USAGE='[-n] [-v] <filespec>...'
SUBDIRECTORY_OK='Yes'
. git-sh-setup
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html