git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Re* [BUG?] "error: cache entry has null sha1"

From
Jeff King <peff@peff.net>
Date
Nov 3, 2013, 08:03 UTC
Message-ID
<20131103080300.GA2868@sigill.intra.peff.net>
In-Reply-To
<1383345895-23341-1-git-send-email-gitster@pobox.com>
On Fri, Nov 01, 2013 at 03:44:52PM -0700, Junio C Hamano wrote:
Show 6 quoted lines
> Here is a proposed endgame for the topic in a patch form, then.
> 
> I've added a test for low-level "read-tree --reset -u A B", and
> tried the "am --abort" I saw the problem with manually, but other
> than that, I haven't (re)thought about the issue hard enough to be
> comfortable with this change yet.
Thanks for moving this forward.

I read over the old discussion and the patches, and I think the patch is a good thing. There was some question from me earlier on whether there were other cases we weren't considering. The discussion convinced me that there almost certainly aren't. And even if there are, this is still the right direction. Writing out a bogus CE_CONFLICTED entry is _certainly_ wrong, so even if we do not get the details right (e.g., rejecting a merge we should be accepting), this patch still forms a base for further fixups.

> Jeff King (1):
>   unpack-trees: fix "read-tree -u --reset A B" with conflicted index
My missing signoff:
  Signed-off-by: Jeff King <peff@peff.net>
-Peff
Previous: Junio C HamanoNext: Jeff King
Message 15 of 17 in “remote-curl: fix large pushes with GSSAPI”
  1. remote-curl: fix large pushes with GSSAPIbrian m. carlson, Oct 29, 2013
  2. Jeff KingOct 30, 2013
  3. brian m. carlsonOct 30, 2013
  4. Jeff KingOct 31, 2013
  5. 1/3 http: return curl's AUTHAVAIL via slot_resultsJeff King, Oct 31, 2013
  6. 2/3 remote-curl: pass curl slot_results back through run_slotJeff King, Oct 31, 2013
  7. [BUG?] "error: cache entry has null sha1"Junio C Hamano, Oct 31, 2013
  8. Jeff KingOct 31, 2013
  9. Jeff KingOct 31, 2013
  10. Junio C HamanoOct 31, 2013
  11. Re* [BUG?] "error: cache entry has null sha1"Junio C Hamano, Nov 1, 2013
  12. 1/3 unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJunio C Hamano, Nov 1, 2013
  13. 2/3 t1005: reindentJunio C Hamano, Nov 1, 2013
  14. 3/3 t1005: add test for "read-tree --reset -u A B"Junio C Hamano, Nov 1, 2013
  15. Jeff KingNov 3, 2013
  16. 3/3 remote-curl: fix large pushes with GSSAPIJeff King, Oct 31, 2013
  17. brian m. carlsonOct 31, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.