On Thu, Oct 31, 2013 at 01:15:39PM -0400, Jeff King wrote:
> On Thu, Oct 31, 2013 at 10:11:49AM -0700, Junio C Hamano wrote:
> > - Try to discard
> > $ git am --abort
> > error: cache entry has null sha1: remote-curl.c
> > fatal: unable to write new index file
> > This should not happen, no?
> > "git reset --hard" will remove the funnies, but still...
> I ran into this recently, too. Isn't it just the twoway_merge bug we
> were discussing here:
> I don't think we ever actually applied a fix.
Also, the followup:
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html