Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] Add a t/t6001 test case for a --merge-order bug
author
Jon Seymour
<jon.seymour@gmail.com>
Wed, 6 Jul 2005 16:39:35 +0000
(
02:39
+1000)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 6 Jul 2005 17:29:30 +0000
(10:29 -0700)
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>
t/t6001-rev-list-merge-order.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
d2775a8
)
diff --git
a/t/t6001-rev-list-merge-order.sh
b/t/t6001-rev-list-merge-order.sh
index d93988de4196ef04da54594a868b13cd61243f3d..fdd5155147ef011b4808467c7ff1c4804a1e9ee8 100755
(executable)
--- a/
t/t6001-rev-list-merge-order.sh
+++ b/
t/t6001-rev-list-merge-order.sh
@@
-438,6
+438,26
@@
a2
a1
EOF
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
+
#
#
#
#