Merge branch 'mg/add-ignore-errors' into maint

* mg/add-ignore-errors: add: ignore only ignored files
2015-01-12 14:02:19 -08:00
parent efc028b1f2 1d31e5a2cd
commit d0879b33a6
2 changed files with 8 additions and 2 deletions
--- 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++)