From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Aug 2007 06:12:38 +0000 (-0700)
Subject: ls-files --error-unmatch: do not barf if the same pattern is given twice.
X-Git-Tag: v1.5.3~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93e23fea2d7538ac24e35b50984dbbbb84d89f9a;p=git.git

ls-files --error-unmatch: do not barf if the same pattern is given twice.

This is most visible when you do "git commit Makefile Makefile"; it
may be a stupid request, but that is not a reason to fail the command.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index d36181a75..cce17b5ce 100644
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -511,8 +511,28 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
 		 */
 		int num, errors = 0;
 		for (num = 0; pathspec[num]; num++) {
+			int other, found_dup;
+
 			if (ps_matched[num])
 				continue;
+			/*
+			 * The caller might have fed identical pathspec
+			 * twice.  Do not barf on such a mistake.
+			 */
+			for (found_dup = other = 0;
+			     !found_dup && pathspec[other];
+			     other++) {
+				if (other == num || !ps_matched[other])
+					continue;
+				if (!strcmp(pathspec[other], pathspec[num]))
+					/*
+					 * Ok, we have a match already.
+					 */
+					found_dup = 1;
+			}
+			if (found_dup)
+				continue;
+
 			error("pathspec '%s' did not match any file(s) known to git.",
 			      pathspec[num] + prefix_offset);
 			errors++;