diff options
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-add.c b/builtin-add.c index 3dd4ded937..105a9f0e1f 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -14,7 +14,7 @@ #include "revision.h" static const char builtin_add_usage[] = -"git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--] <filepattern>..."; +"git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <filepattern>..."; static int take_worktree_changes; static const char *excludes_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++) |