diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-08 23:51:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-08 23:51:38 -0700 |
| commit | bf8fc21c69559684b81669ab929db2ff1f37b3d7 (patch) | |
| tree | dd426df77f7cde2b6f68c95b36ce3353c68b363b | |
| parent | 651aef3428d9688e3fdffc6760380ead47debb9f (diff) | |
| parent | ac78b009398f8cab1f57d1ef62db21ac95e11ed1 (diff) | |
| download | git-bf8fc21c69559684b81669ab929db2ff1f37b3d7.tar.gz git-bf8fc21c69559684b81669ab929db2ff1f37b3d7.tar.xz | |
Merge branch 'maint'
* maint:
ls-files: die instead of fprintf/exit in -i error
| -rw-r--r-- | builtin-ls-files.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index f47322050..2c95ca610 100644 --- 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 | |