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

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>

diff --git a/builtin-add.c b/builtin-add.c
index b08e68831a3d3b5ff91e679b4e1862bf65f22bff..105a9f0e1f6aef67f67d985a40a036a4ba833cbe 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -155,7 +155,7 @@ static int git_add_config(const char *var, const char *value)
 
 static struct lock_file lock_file;
 
 
 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)
 "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) {
                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");
                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++)
        }
 
        for (i = 0; i < dir.nr; i++)