Re: [BUG?] "error: cache entry has null sha1"
- From
Jeff King <peff@peff.net>
- Date
- Oct 31, 2013, 17:15 UTC
- Message-ID
- <20131031171539.GA19142@sigill.intra.peff.net>
- In-Reply-To
- <xmqqeh719xgq.fsf_-_@gitster.dls.corp.google.com>
On Thu, Oct 31, 2013 at 10:11:49AM -0700, Junio C Hamano wrote:
Show 9 quoted lines
> - 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:
http://thread.gmane.org/gmane.comp.version-control.git/202440/focus=212316
I don't think we ever actually applied a fix.
-Peff