diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-12 14:02:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-12 14:02:19 -0800 |
| commit | d0879b33a6c34285a870e351e8eaee5cd695e92d (patch) | |
| tree | 17df01c0a750aabdc9ec86e40921a2c37597b48b /builtin | |
| parent | efc028b1f2c6da6558094326083f7643453bfccd (diff) | |
| parent | 1d31e5a2cd9f90799330d5095783e7b972357f0e (diff) | |
| download | git-d0879b33a6c34285a870e351e8eaee5cd695e92d.tar.gz | |
Merge branch 'mg/add-ignore-errors' into maint
* 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++) |