Browse Source

Merge branch 'sb/grep-die-on-unreadable-index'

Error behaviour of "git grep" when it cannot read the index was
inconsistent with other commands that uses the index, which has
been corrected to error out early.

* sb/grep-die-on-unreadable-index:
  grep: handle corrupt index files early
maint
Junio C Hamano 7 years ago
parent
commit
6ac5acae2d
  1. 3
      builtin/grep.c

3
builtin/grep.c

@ -488,7 +488,8 @@ static int grep_cache(struct grep_opt *opt, struct repository *repo, @@ -488,7 +488,8 @@ static int grep_cache(struct grep_opt *opt, struct repository *repo,
strbuf_addstr(&name, repo->submodule_prefix);
}

repo_read_index(repo);
if (repo_read_index(repo) < 0)
die("index file corrupt");

for (nr = 0; nr < repo->index->cache_nr; nr++) {
const struct cache_entry *ce = repo->index->cache[nr];

Loading…
Cancel
Save