From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Oct 2009 06:51:38 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bf8fc21c69559684b81669ab929db2ff1f37b3d7?hp=651aef3428d9688e3fdffc6760380ead47debb9f

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 f473220502..2c95ca6105 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 |