From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Dec 2012 19:21:47 GMT
Subject: Re: "fatal: git-write-tree: error building trees" from `git stash`
Message-ID: <7vlicjl2r8.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1356634556.13818.136.camel@umgah.localdomain>

Alex Vandiver <alex@chmrr.net> writes:

> ... "Cannot stash while resolving conflicts" or similar would be
> more understandable to the end user than the above.

Interestingly enough, the "apply" side is protected with this one
liner:

        # current index state
        c_tree=$(git write-tree) ||
                die "$(gettext "Cannot apply a stash in the middle of a merge")"

since 5fd448f (git stash: Give friendlier errors when there is
nothing to apply, 2009-08-11).  I would think something in line with
that change on the "create" side is a welcome one.

Thanks.