diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:30 -0800 |
| commit | 017820702142458b8d8ae1d1af1362e48b696377 (patch) | |
| tree | 33cf69eb224e2ace5c488a3556463e788af702d0 /builtin | |
| parent | Merge branch 'jk/lock-ref-sha1-basic-return-errors' (diff) | |
| parent | add: ignore only ignored files (diff) | |
| download | tgif-017820702142458b8d8ae1d1af1362e48b696377.tar.xz | |
Merge branch 'mg/add-ignore-errors'
"git add --ignore-errors ..." did not ignore an error to
give a file that did not exist.
* mg/add-ignore-errors:
add: ignore only ignored files
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c index ae6d3e262b..1074e32349 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -284,7 +284,7 @@ static int add_files(struct dir_struct *dir, int flags) 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")); - die(_("no files added")); + exit_status = 1; } for (i = 0; i < dir->nr; i++) |