From 6e4c0a51092e3ec3429ca91890b99e198aa367bd Mon Sep 17 00:00:00 2001 From: Jon Seymour Date: Thu, 23 Jun 2005 12:01:09 +1000 Subject: [PATCH] [PATCH] A test case that demonstrates a problem with merges with two roots. git-rev-list --merge-order is omitting one of the roots when displaying a merge containing two distinct roots. A subsequent patch will fix the problem. Signed-off-by: Jon Seymour Signed-off-by: Linus Torvalds --- t/t6001-rev-list-merge-order.sh | 61 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) mode change 100644 => 100755 t/t6001-rev-list-merge-order.sh diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh old mode 100644 new mode 100755 index a99644103d..4263db5876 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -172,6 +172,13 @@ on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3 on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4 on_committer_date "1971-08-16 00:00:19" save_tag m1 unique_commit m1 tree -p a4 -p c3 on_committer_date "1971-08-16 00:00:20" save_tag m2 unique_commit m2 tree -p c3 -p a4 +on_committer_date "1971-08-16 00:00:21" hide_error save_tag alt_root unique_commit alt_root tree +on_committer_date "1971-08-16 00:00:22" save_tag r0 unique_commit r0 tree -p alt_root +on_committer_date "1971-08-16 00:00:23" save_tag r1 unique_commit r1 tree -p r0 +on_committer_date "1971-08-16 00:00:24" save_tag l5r1 unique_commit l5r1 tree -p l5 -p r1 +on_committer_date "1971-08-16 00:00:25" save_tag r1l5 unique_commit r1l5 tree -p r1 -p l5 + + # # note: as of 20/6, it isn't possible to create duplicate parents, so this # can't be tested. @@ -483,6 +490,60 @@ EOF test_expect_success "head ^head no --merge-order" 'git-rev-list a3 ^a3' <