From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 25 Jul 2019 19:55:19 GMT
Subject: Re: [PATCH 06/19] Change call signature of write_tree_from_memory()
Message-ID: <nycvar.QRO.7.76.6.1907252153530.21907@tvgsbejvaqbjf.bet>
In-Reply-To: <20190725174611.14802-7-newren@gmail.com>

Hi Elijah,

On Thu, 25 Jul 2019, Elijah Newren wrote:

> diff --git a/merge-recursive.c b/merge-recursive.c
> index 7f56cb0ed1..1a3c6ab7f3 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> [...]
> @@ -434,11 +434,10 @@ struct tree *write_tree_from_memory(struct merge_options *opt)
>
>  	if (!cache_tree_fully_valid(istate->cache_tree) &&
>  	    cache_tree_update(istate, 0) < 0) {
> -		err(opt, _("error building trees"));
> -		return NULL;
> +		BUG("error building trees");

Hmm. Is it possible that something else than a bug in Git causes this to
fail?

I wonder, for example, whether a full disk can cause
`cache_tree_update()` to return a negative value.

Ciao,
Dscho