From: Jon Seymour <jon.seymour@gmail.com>
Date: Wed, 6 Jul 2005 16:39:35 +0000 (+1000)
Subject: [PATCH] Add a t/t6001 test case for a --merge-order bug
X-Git-Tag: v0.99~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d3a63ba3a1f80e03312c5ec28734b27583a0756;p=git.git

[PATCH] Add a t/t6001 test case for a --merge-order bug

This test case demonstrates a problem with --merge-order.

A
|
B
|\
C D
|/
E
|
F

git-rev-list --merge-order A B doesn't produce the expected output of

A
B
D
C
E
F

The problem is fixed by a subsequent patch.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index d93988de4..fdd515514 100755
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -438,6 +438,26 @@ a2
 a1
 EOF
 
+test_output_expect_success "--merge-order a4 l3" "git-rev-list --merge-order a4 l3" <<EOF
+l3
+a4
+c3
+c2
+c1
+b4
+b3
+b2
+b1
+a3
+a2
+a1
+a0
+l2
+l1
+l0
+root
+EOF
+
 #
 #