From: Junio C Hamano Date: Tue, 10 May 2011 05:51:10 GMT Subject: [PATCH 1/9] grep: use get_pathspec() correctly Message-ID: <1305006678-4051-2-git-send-email-gitster@pobox.com> In-Reply-To: <1305006678-4051-1-git-send-email-gitster@pobox.com> 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 --- builtin/grep.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 0bf8c01..222dd6d 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; -- 1.7.5.1.290.g1b565