From: Jeff King <peff@peff.net>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Jens Lehmann <Jens.Lehmann@web.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/3] do not write null sha1s to on-disk index
Date: Sat, 29 Dec 2012 06:05:41 -0500 [thread overview]
Message-ID: <20121229110541.GA1408@sigill.intra.peff.net> (raw)
In-Reply-To: <20121229103430.GG18903@elie.Belkin>
On Sat, Dec 29, 2012 at 02:34:30AM -0800, Jonathan Nieder wrote:
> >> $ git am --abort
> >> Unstaged changes after reset:
> >> M sound/usb/midi.c
> >
> > What does your index look like afterwards? Does it have a null sha1 in
> > it (check "ls-files -s")?
>
> $ git diff-index --abbrev HEAD
> :100644 100644 eeefbce3873c... 000000000000... M sound/usb/midi.c
> $ git ls-files --abbrev -s sound/usb/midi.c
> 100644 eeefbce3873c 0 sound/usb/midi.c
Hmm. It looks like "am --abort" overwrites the index again after the
read-tree which complains. If I downgrade the error in write_index to a
warning, like this:
diff --git a/read-cache.c b/read-cache.c
index fda78bc..70a6d86 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1797,7 +1797,7 @@ int write_index(struct index_state *istate, int newfd)
if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
ce_smudge_racily_clean_entry(ce);
if (is_null_sha1(ce->sha1))
- return error("cache entry has null sha1: %s", ce->name);
+ warning("cache entry has null sha1: %s", ce->name);
if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
return -1;
}
and then just run this:
[clear state from last run]
$ rm -rf .git/rebase-apply
$ git reset --hard
[apply the patch; we get a conflict]
$ git am -3sc queue-3.2/alsa-usb-audio-fix-missing-autopm-for-midi-input.patch
[now run just the read-tree from "am --abort"]
$ git.compile read-tree --reset -u HEAD ORIG_HEAD
warning: cache entry has null sha1: sound/usb/midi.c
[and now check our index]
$ git ls-files -s sound/usb/midi.c
100644 0000000000000000000000000000000000000000 0 sound/usb/midi.c
[yes, this index is bogus]
$ git write-tree
error: invalid object 100644 0000000000000000000000000000000000000000 for 'sound/usb/midi.c'
fatal: git-write-tree: error building trees
So I think this check may actually be finding a real bug. I have seen
these null sha1s in the wild, but I was never able to track down the
actual cause. Maybe this will give us a clue. Now we just need to work
backwards and figure out who is putting it in the in-memory index and
why.
I'll try to work on it tomorrow, but please don't let that stop you if
you want to keep digging in the meantime.
-Peff
next prev parent reply other threads:[~2012-12-29 11:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-28 15:01 [PATCH 0/3] null sha1 in trees Jeff King
2012-07-28 15:03 ` [PATCH 1/3] diff: do not use null sha1 as a sentinel value Jeff King
2012-07-28 15:05 ` [PATCH 2/3] do not write null sha1s to on-disk index Jeff King
2012-12-29 10:03 ` Jonathan Nieder
2012-12-29 10:27 ` Jeff King
2012-12-29 10:34 ` Jonathan Nieder
2012-12-29 10:42 ` Jeff King
2012-12-29 10:51 ` Jonathan Nieder
2012-12-29 11:05 ` Jeff King [this message]
2012-12-29 20:51 ` [BUG] two-way read-tree can write null sha1s into index Jeff King
2013-01-01 22:24 ` Junio C Hamano
2013-01-03 8:37 ` Jeff King
2013-01-03 15:34 ` Junio C Hamano
2013-01-03 20:23 ` Jeff King
2013-01-03 20:34 ` Junio C Hamano
2013-01-03 20:36 ` Jeff King
2013-01-03 22:33 ` Junio C Hamano
2013-01-07 13:46 ` Jeff King
2012-12-29 10:40 ` [PATCH 2/3] do not write null sha1s to on-disk index Jonathan Nieder
2012-07-28 15:06 ` [PATCH 3/3] fsck: detect null sha1 in tree entries Jeff King
2012-07-29 22:15 ` [PATCH 0/3] null sha1 in trees Junio C Hamano
2012-07-30 15:42 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121229110541.GA1408@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).