Am 01.06.2016 um 00:14 schrieb Jeff King: > Right, we use the index for reachability checks (both in "prune", but > also during a "repack -a", which uses the revision parser's > '--indexed-objects" option). That obviously should handle per-worktree > index files, but I don't know whether it currently does. Thanks. Here's a test case to make sure that --indexed-objects looks at the indexes of separate worktrees. I'm not submitting a proper patch because I don't feel like being able to fix the problem and I'm not sure what the expected order of the listed objects is. diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index 3e752ce..dbd3679 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -96,6 +96,34 @@ test_expect_success 'rev-list can show index objects' ' test_cmp expect actual ' +test_expect_success '--indexed-objects in the index of a separate worktrees' ' + # see also the comments in the previous case + cat >expect <<-\EOF && + 8e4020bb5a8d8c873b25de15933e75cc0fc275df one + d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index + 2043d83f5a374f119437856d2f1773c936938876 only-in-wt-index + 9200b628cf9dc883a85a7abc8d6e6730baee589c two + EOF + echo only-in-index >only-in-index && + git add only-in-index && + + git worktree add -b side wt && + test_when_finished "rm -r wt; git worktree prune" && + ( + cd wt && + echo only-in-wt-index >only-in-wt-index && + git add only-in-wt-index && + + # this must also include the objects of the main worktree + git rev-list --objects --indexed-objects >../actual + ) && + test_cmp expect actual && + + # same result when invoked from the main worktree + git rev-list --objects --indexed-objects >actual && + test_cmp expect actual +' + test_expect_success '--bisect and --first-parent can not be combined' ' test_must_fail git rev-list --bisect --first-parent HEAD ' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html