summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-07-06 16:39:35 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 17:29:30 (GMT)
commit4d3a63ba3a1f80e03312c5ec28734b27583a0756 (patch)
tree89513c5711d595b95539fbe8264d59c51b58117a /t
parentd2775a817a19d966ec35a1da9440e2feb55276f4 (diff)
downloadgit-4d3a63ba3a1f80e03312c5ec28734b27583a0756.zip
git-4d3a63ba3a1f80e03312c5ec28734b27583a0756.tar.gz
git-4d3a63ba3a1f80e03312c5ec28734b27583a0756.tar.bz2
[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>
Diffstat (limited to 't')
-rwxr-xr-xt/t6001-rev-list-merge-order.sh20
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index d93988d..fdd5155 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
+
#
#