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

From: Jon Seymour <jon.seymour@gmail.com>
Date: Jul 6, 2005, 14:44 UTC
Message-ID: <20050706144406.17750.qmail@blackcubes.dyndns.org>

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

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
This patch is known designed to apply on top of:

[PATCH 1/6] Temporary fixup to rev-list.c to restore expected order of arguments presented to --merge-order sort. [PATCH 2/6] Swap order of insert_by_date arguments [PATCH 3/6] Introduce struct rev_list_fns to rev-list.c to reduce amount of conditional processing. [PATCH 4/6] Add a topological sort procedure to commit.c [rev 4] [PATCH 5/6] Introduce --topo-order switch to git-rev-list [PATCH 6/6] Change gitk so that it uses --topo-order rather than --merge-order

and

[PATCH 1/3] Factor out useful test case infrastructure from t/t6001... into t/t6000-lib.sh [PATCH 2/3] Introduce unit tests for git-rev-list --bisect [PATCH 3/3] Change the sed seperator in t/t6000-lib.sh.

A subsequent patch will fix the problem. ---

 t/t6001-rev-list-merge-order.sh |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

3c04d86fbc9310e823a6a46ac7bf295fda57c7b7

diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
--- 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
+
 #
 #
 
------------