From da4b932a0c5b249694216b1580b7bc2ded9e0280 Mon Sep 17 00:00:00 2001 From: Jon Seymour Date: Thu, 30 Jun 2005 09:45:30 +1000 Subject: [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 --- t/t6001-rev-list-merge-order.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 4263db5876..29167e9a77 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" <