Merge branch 'maint'

* maint:
ls-files: die instead of fprintf/exit in -i error

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index f473220502027b4f9e6ed9a17ffafd42538add80..2c95ca61056f0c0b6ac0240605e2e4de895a6804 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -524,11 +524,8 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
                ps_matched = xcalloc(1, num);
        }
 
-       if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given) {
-               fprintf(stderr, "%s: --ignored needs some exclude pattern\n",
-                       argv[0]);
-               exit(1);
-       }
+       if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
+               die("ls-files --ignored needs some exclude pattern");
 
        /* With no flags, we default to showing the cached files */
        if (!(show_stage | show_deleted | show_others | show_unmerged |