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
