From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [BUG?] "error: cache entry has null sha1"
Date: Thu, 31 Oct 2013 13:15:40 -0400 [thread overview]
Message-ID: <20131031171539.GA19142@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqeh719xgq.fsf_-_@gitster.dls.corp.google.com>
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:
http://thread.gmane.org/gmane.comp.version-control.git/202440/focus=212316
I don't think we ever actually applied a fix.
-Peff
next prev parent reply other threads:[~2013-10-31 17:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 2:36 [PATCH v4] remote-curl: fix large pushes with GSSAPI brian m. carlson
2013-10-30 8:45 ` Jeff King
2013-10-30 22:40 ` brian m. carlson
2013-10-31 6:34 ` Jeff King
2013-10-31 6:35 ` [PATCH 1/3] http: return curl's AUTHAVAIL via slot_results Jeff King
2013-10-31 6:36 ` [PATCH 2/3] remote-curl: pass curl slot_results back through run_slot Jeff King
2013-10-31 17:11 ` [BUG?] "error: cache entry has null sha1" Junio C Hamano
2013-10-31 17:15 ` Jeff King [this message]
2013-10-31 17:21 ` Jeff King
2013-10-31 18:07 ` Junio C Hamano
2013-11-01 22:44 ` Re* " Junio C Hamano
2013-11-01 22:44 ` [PATCH 1/3] unpack-trees: fix "read-tree -u --reset A B" with conflicted index Junio C Hamano
2013-11-01 22:44 ` [PATCH 2/3] t1005: reindent Junio C Hamano
2013-11-01 22:44 ` [PATCH 3/3] t1005: add test for "read-tree --reset -u A B" Junio C Hamano
2013-11-03 8:03 ` Re* [BUG?] "error: cache entry has null sha1" Jeff King
2013-10-31 6:36 ` [PATCH 3/3] remote-curl: fix large pushes with GSSAPI Jeff King
2013-10-31 22:49 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131031171539.GA19142@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).