mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'maint'
* maint: ls-files: die instead of fprintf/exit in -i error
This commit is contained in:
commit
bf8fc21c69
|
@ -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 |
|
||||
|
|
Loading…
Reference in a new issue