Re: 'pu' broken at t5304 tonight

From: Christian Couder <christian.couder@gmail.com>
Date: Jun 11, 2017, 04:13 UTC
Message-ID: <CAP8UFD0nDaBCiWiho7zJtUZ3MpgPY97NQ0AXnGq7parQBi=sMw@mail.gmail.com>
In-Reply-To: <20170610190510.GE27719@alpha.vpn.ikke.info>

On Sat, Jun 10, 2017 at 9:05 PM, Kevin Daudt <me@ikke.info> wrote:

> On Sat, Jun 10, 2017 at 02:48:36PM +0200, Kevin Daudt wrote:

Show 13 quoted lines

>> For me, this bisects to the latest merge:
>>
>> 2047eebd3 (Merge branch 'bw/repo-object' into pu, 2017-06-10), but
>> neither of the parent of the merge break this test, so it looks like
>> it's because of an interaction between the repo-object topic and another
>> topic.
>
> Merging the repo-object with different other topic branches reveals this
> topic to cause the bad interaction:
>
> b56c91004 (Merge branch 'nd/prune-in-worktree' into pu, 2017-06-10)
>
> Still investigating why it happens.

Yeah, 9570b25a97 (revision.c: --indexed-objects add objects from all worktrees, 2017-04-19) adds the following test to t5304-prune.sh but this fails if nd/prune-in-worktree is rebased on top of bw/repo-object:

test_expect_success 'prune: handle index in multiple worktrees' '
       git worktree add second-worktree &&
       echo "new blob for second-worktree" >second-worktree/blob &&
       git -C second-worktree add blob &&
       git prune --expire=now &&
       git -C second-worktree show :blob >actual &&
       test_cmp second-worktree/blob actual
'