undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-add: Make the "tried to add ignored file" error message less confusing

Browse Source 
Currently the error message seems to imply (at least to me) that only
the listed files were withheld and the rest of the files was added to the
index, even though that's obviously not the case.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Petr Baudis 2007-08-29 00:41:23 +02:00 committed by Junio C Hamano
parent ce312affa1
commit b39c53e662
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-add.c
View File

@ -155,7 +155,7 @@ static int git_add_config(const char *var, const char *value)
static struct lock_file lock_file;
static const char ignore_warning[] =
static const char ignore_error[] =
"The following paths are ignored by one of your .gitignore files:\n";
int cmd_add(int argc, const char **argv, const char *prefix)
@ -250,12 +250,12 @@ int cmd_add(int argc, const char **argv, const char *prefix)
die("index file corrupt");
if (dir.ignored_nr) {
fprintf(stderr, ignore_warning);
fprintf(stderr, ignore_error);
for (i = 0; i < dir.ignored_nr; i++) {
fprintf(stderr, "%s\n", dir.ignored[i]->name);
}
fprintf(stderr, "Use -f if you really want to add them.\n");
exit(1);
die("no files added");
}
for (i = 0; i < dir.nr; i++)