зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
d2775a817a
Коммит
4d3a63ba3a
|
@ -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
|
||||
|
||||
#
|
||||
#
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче