From: Jon Seymour Date: Wed, 29 Jun 2005 23:45:30 +0000 (+1000) Subject: [PATCH] Test case that demonstrates problem with --merge-order ^ processing X-Git-Tag: v0.99~117 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=da4b932a0c5b249694216b1580b7bc2ded9e0280;p=git.git [PATCH] Test case that demonstrates problem with --merge-order ^ processing Added a test case that shows that --merge-order doesn't produce the correct result in the following case. A | | B |/ C | D git-rev-list --merge-order A ^B should produce just A. Instead it produces BCD. A subsequent patch will fix this defect. Signed-off-by: Jon Seymour Signed-off-by: Linus Torvalds --- diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 4263db58..29167e9a 100755 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -543,6 +543,11 @@ test_output_expect_success 'simple merge order (r1l5)' 'git-rev-list --merge-ord = alt_root EOF +test_output_expect_success "don't print things unreachable from one branch" "git-rev-list a3 ^b3 --merge-order" <