Merge branch 'dk/format-patch-ignore-diff-submodule' into maint

diff --git a/builtin/add.c b/builtin/add.c
index ae6d3e262bcbb3dc57c0ddf146791380259b31be..1074e3234964deb279c3a487e9efd164afdb9c6c 100644 (file)
--- 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++)