From: Bryan Turner <bturner@atlassian.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, Git Users <git@vger.kernel.org>
Subject: Re: git diff-tree commit detail bug in 2.0.2 and 2.0.3
Date: Mon, 28 Jul 2014 22:08:20 +1000 [thread overview]
Message-ID: <CAGyf7-GVz8ME0Mq_DyHCSFCx5KN6qLGEgtgMSv2NkKb9AGEGdg@mail.gmail.com> (raw)
In-Reply-To: <20140728104409.GC10737@peff.net>
On Mon, Jul 28, 2014 at 8:44 PM, Jeff King <peff@peff.net> wrote:
> On Mon, Jul 28, 2014 at 06:35:04AM -0400, Jeff King wrote:
>
>> I haven't reproduced here yet, but this is almost certainly the bug
>> where lookup_unknown_object causes a bogus commit->index field (and
>> prior to the commit you found, diff-tree did not use commit->index).
>>
>> The series that Junio has in jk/alloc-commit-id should fix the problem
>> (it's in master already, and slated for v2.1.0).
>
> Yep, that's definitely it. Here's the minimum reproduction:
>
> git init
> git commit --allow-empty -m one
> git commit --allow-empty -m two
> git rev-list HEAD | git diff-tree --stdin --always --format=%s
>
> That yields:
>
> one
> one
>
> on v2.0.3, but merging in jk/alloc-commit-id yields:
>
> two
> one
>
> -Peff
Thanks for digging into it, Jeff. I should have tried it against 2.1.0
myself. I've run my entire matrix of tests now against 2.1.0-rc0 and
the diff-tree bug appears fixed on that tag. I noticed a different
change, though:
bturner@ubuntu:~/tmp/test$ /opt/git/2.1.0-rc0/bin/git check-ref-format
ref/with/trailing/dot.
bturner@ubuntu:~/tmp/test$ echo $?
0
bturner@ubuntu:~/tmp/test$ /opt/git/2.0.3/bin/git check-ref-format
ref/with/trailing/dot.
bturner@ubuntu:~/tmp/test$ echo $?
1
It looks like refs ending in a dot are now legal in 2.1.0? Is that
intentional? A quick git bisect is fingering:
bturner@ubuntu:~/Development/oss/git/git$ git bisect bad
745224e04a03e4544c58d5d38d3c54f67100f8eb is the first bad commit
commit 745224e04a03e4544c58d5d38d3c54f67100f8eb
Author: David Turner <dturner@twopensource.com>
Date: Wed Jun 18 01:54:42 2014 -0400
Best regards,
Bryan Turner
next prev parent reply other threads:[~2014-07-28 12:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 9:42 git diff-tree commit detail bug in 2.0.2 and 2.0.3 Bryan Turner
2014-07-28 10:18 ` Ramsay Jones
2014-07-28 10:35 ` Jeff King
2014-07-28 10:44 ` Jeff King
2014-07-28 12:08 ` Bryan Turner [this message]
2014-07-28 15:35 ` Junio C Hamano
2014-07-28 15:48 ` Jeff King
2014-07-28 17:32 ` Junio C Hamano
2014-07-28 17:37 ` Jeff King
2014-07-28 18:01 ` Jeff King
2014-07-28 18:19 ` Junio C Hamano
2014-07-29 0:11 ` Junio C Hamano
2014-07-29 1:06 ` Bryan Turner
2014-07-29 7:54 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGyf7-GVz8ME0Mq_DyHCSFCx5KN6qLGEgtgMSv2NkKb9AGEGdg@mail.gmail.com \
--to=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).