@matheusbsbs / matheus-bagliano / commits / dca3b5f5ce

grep: do not unnecessarily query repo for "--"

When running a command of the form git grep --no-index pattern -- path in the absence of a Git repository, an error message will be printed: fatal: BUG: setup_git_env called without repository This is because "git grep" tries to interpret "--" as a rev. "git grep" has always tried to first interpret "--" as a rev for at least a few years, but this issue was upgraded from a pessimization to a bug in commit 59332d1 ("Resurrect "git grep --no-index"", 2010-02-06), which calls get_sha1 regardless of whether --no-index was specified. This bug appeared to be benign until commit b1ef400 ("setup_git_env: avoid blind fall-back to ".git"", 2016-10-20) when Git was taught to die in this situation. (This "git grep" bug appears to be one of the bugs that commit b1ef400 is meant to flush out.) Therefore, always interpret "--" as signaling the end of options, instead of trying to interpret it as a rev first. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Tan committed Feb 14, 2017 at 01:03 UTC dca3b5f5cef8138e695f87e6cb37fb2063a10ea4

2 files changed +20 -4

builtin/grep.c

+5 -4

@@ -1154,6 +1154,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix)

1154 const char *arg = argv[i];

1155 unsigned char sha1[20];

1156 struct object_context oc;

1157 + if (!strcmp(arg, "--")) {

1158 + i++;

1159 + seen_dashdash = 1;

1160 + break;

1161 + }

1162 /* Is it a rev? */

1163 if (!get_sha1_with_context(arg, 0, sha1, &oc)) {

1164 struct object *object = parse_object_or_die(sha1, arg);

@@ -1162,10 +1167,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)

1167 add_object_array_with_path(object, arg, &list, oc.mode, oc.path);

1168 continue;

1169 }

1165 - if (!strcmp(arg, "--")) {

1166 - i++;

1167 - seen_dashdash = 1;

1168 - }

1170 break;

1171 }

1172

t/t7810-grep.sh

+15

@@ -982,6 +982,21 @@ test_expect_success 'grep -e -- -- path' '

982 test_cmp expected actual

983 '

984

985 +test_expect_success 'grep --no-index pattern -- path' '

986 + rm -fr non &&

987 + mkdir -p non/git &&

988 + (

989 + GIT_CEILING_DIRECTORIES="$(pwd)/non" &&

990 + export GIT_CEILING_DIRECTORIES &&

991 + cd non/git &&

992 + echo hello >hello &&

993 + echo goodbye >goodbye &&

994 + echo hello:hello >expect &&

995 + git grep --no-index o -- hello >actual &&

996 + test_cmp expect actual

997 + )

998 +'

999 +

1000 cat >expected <<EOF

1001 hello.c:int main(int argc, const char **argv)

1002 hello.c: printf("Hello world.\n");