undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jeff King 2017-02-14 01:07:29 -05:00 committed by Junio C Hamano
parent b5b81136da
commit d0ffc06933
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/grep.c
View File

@ -1176,6 +1176,12 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
break; break;
} }
if (!use_index) {
if (seen_dashdash)
die(_("--no-index cannot be used with revs"));
break;
}
if (get_sha1_with_context(arg, 0, sha1, &oc)) { if (get_sha1_with_context(arg, 0, sha1, &oc)) {
if (seen_dashdash) if (seen_dashdash)
die(_("unable to resolve revision: %s"), arg); die(_("unable to resolve revision: %s"), arg);

13
t/t7810-grep.sh
View File

@ -1030,6 +1030,19 @@ test_expect_success 'grep --no-index pattern -- path' '
) )
' '
test_expect_success 'grep --no-index complains of revs' '
test_must_fail git grep --no-index o master -- 2>err &&
test_i18ngrep "no-index cannot be used with revs" err
'
test_expect_success 'grep --no-index prefers paths to revs' '
test_when_finished "rm -f master" &&
echo content >master &&
echo master:content >expect &&
git grep --no-index o master >actual &&
test_cmp expect actual
'
cat >expected <<EOF cat >expected <<EOF
hello.c:int main(int argc, const char **argv) hello.c:int main(int argc, const char **argv)
hello.c: printf("Hello world.\n"); hello.c: printf("Hello world.\n");