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

gitster · gitster · commit 6ac5acae2d93 · 2018-05-30T21:51:26.000+09:00
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
diff --git a/builtin/grep.c b/builtin/grep.c
@@ -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];

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,8 @@ static int grep_cache(struct grep_opt opt, struct repository repo,`
`488`	`488`	`strbuf_addstr(&name, repo->submodule_prefix);`
`489`	`489`	`}`
`490`	`490`
`491`		`- repo_read_index(repo);`
	`491`	`+ if (repo_read_index(repo) < 0)`
	`492`	`+ die("index file corrupt");`
`492`	`493`
`493`	`494`	`for (nr = 0; nr < repo->index->cache_nr; nr++) {`
`494`	`495`	`const struct cache_entry *ce = repo->index->cache[nr];`