From 4d3a63ba3a1f80e03312c5ec28734b27583a0756 Mon Sep 17 00:00:00 2001 From: Jon Seymour Date: Thu, 7 Jul 2005 02:39:35 +1000 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- t/t6001-rev-list-merge-order.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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" <