[PATCH] Test case that demonstrates problem with --merge-order ^ processing
authorJon Seymour <jon.seymour@gmail.com>
Wed, 29 Jun 2005 23:45:30 +0000 (09:45 +1000)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 03:53:10 +0000 (20:53 -0700)
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 <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
t/t6001-rev-list-merge-order.sh

index 4263db5..29167e9 100755 (executable)
@@ -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" <<EOF
+a3
+a2
+a1
+EOF
 
 #
 #