From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 May 2011 04:34:04 +0000 (-0700)
Subject: grep: use get_pathspec() correctly
X-Git-Tag: v1.7.6-rc0~44^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c5f3cc4a5680e23b8aa378ed9b655a1779ee881;p=git.git

grep: use get_pathspec() correctly

When there is no remaining string in argv, get_pathspec(prefix, argv)
will return a two-element array that has prefix as the first element,
so there is no need to re-roll that logic in the code that uses
get_pathspec().

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

diff --git a/builtin/grep.c b/builtin/grep.c
index 0bf8c0116..222dd6d9a 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -956,13 +956,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			verify_filename(prefix, argv[j]);
 	}
 
-	if (i < argc)
-		paths = get_pathspec(prefix, argv + i);
-	else if (prefix) {
-		paths = xcalloc(2, sizeof(const char *));
-		paths[0] = prefix;
-		paths[1] = NULL;
-	}
+	paths = get_pathspec(prefix, argv + i);
 	init_pathspec(&pathspec, paths);
 	pathspec.max_depth = opt.max_depth;
 	pathspec.recursive = 1;