Re: [PATCH] grep: handle corrupt index files early
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- May 15, 2018, 12:18 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1805151418170.77@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20180515010425.149200-1-sbeller@google.com>
Hi Stefan,
On Mon, 14 May 2018, Stefan Beller wrote:
Show 23 quoted lines
> Any other caller of 'repo_read_index' dies upon a negative return of
> it, so grep should, too.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>
> Found while reviewing the series
> https://public-inbox.org/git/20180514105823.8378-1-ao2@ao2.it/
>
> builtin/grep.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 6e7bc76785a..69f0743619f 100644
> --- 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");Looks obviously correct, thanks!
Ciao, Dscho