From: Jeff King <peff@peff.net>
Date: Sat, 11 Aug 2007 13:49:28 GMT
Subject: Re: Bug in gitk: can't unset "idinlist(...) ..."
Message-ID: <20070811134927.GA2411@coredump.intra.peff.net>
In-Reply-To: <18109.21984.26228.849806@cargo.ozlabs.ibm.com>

On Sat, Aug 11, 2007 at 04:23:28PM +1000, Paul Mackerras wrote:

> There has been a commit with duplicate parents in the kernel git tree
> for ages (13e65280), and gitk handles it just fine, so I don't think
> it's simply a problem with duplicate parents.

gitk fails with this test script, which creates two commits, the second
one referencing the first as a duplicate:

mkdir repo &&
cd repo &&
git-init &&
echo one >file &&
git-add file &&
git-commit -m one &&
echo two >file &&
git-add file &&
tree=$(git-write-tree) &&
parent=$(git-rev-parse HEAD) &&
commit=$(git-commit-tree $tree -p $parent -p $parent <file) &&
git-update-ref HEAD $commit &&
gitk

To run it, you will actually need to disable git-commit-tree's checking
for duplicate parents. You can do this by commenting out the call to
new_parent in builtin-commit-tree.c:114.

-Peff