@matheusbsbs / matheus-bagliano / commits / d0ffc06933

grep: avoid resolving revision names in --no-index case

We disallow the use of revisions with --no-index, but we don't actually check and complain until well after we've parsed the revisions. This is the cause of a few problems: 1. We shouldn't be calling get_sha1() at all when we aren't in a repository, as it might access the ref or object databases. For now, this should generally just return failure, but eventually it will become a BUG(). 2. When there's a "--" disambiguator and you're outside a repository, we'll complain early with "unable to resolve revision". But we can give a much more specific error. 3. When there isn't a "--" disambiguator, we still do the normal rev/path checks. This is silly, as we know we cannot have any revs with --no-index. Everything we see must be a path. Outside of a repository this doesn't matter (since we know it won't resolve), but inside one, we may complain unnecessarily if a filename happens to also match a refname. This patch skips the get_sha1() call entirely in the no-index case, and behaves as if it failed (with the exception of giving a better error message). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Feb 14, 2017 at 01:07 UTC d0ffc069331b490ca15418ca7025d5b9024fbad5

2 files changed +19

builtin/grep.c

@@ -1176,6 +1176,12 @@ int cmd_grep(int argc, const char **argv, const char *prefix)

1176 break;

1177 }

1178

1179 + if (!use_index) {

1180 + if (seen_dashdash)

1181 + die(_("--no-index cannot be used with revs"));

1182 + break;

1183 + }

1184 +

1185 if (get_sha1_with_context(arg, 0, sha1, &oc)) {

1186 if (seen_dashdash)

1187 die(_("unable to resolve revision: %s"), arg);

t/t7810-grep.sh

+13

@@ -1030,6 +1030,19 @@ test_expect_success 'grep --no-index pattern -- path' '

1030 )

1031 '

1032

1033 +test_expect_success 'grep --no-index complains of revs' '

1034 + test_must_fail git grep --no-index o master -- 2>err &&

1035 + test_i18ngrep "no-index cannot be used with revs" err

1036 +'

1037 +

1038 +test_expect_success 'grep --no-index prefers paths to revs' '

1039 + test_when_finished "rm -f master" &&

1040 + echo content >master &&

1041 + echo master:content >expect &&

1042 + git grep --no-index o master >actual &&

1043 + test_cmp expect actual

1044 +'

1045 +

1046 cat >expected <<EOF

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

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