Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] Test case that demonstrates problem with --merge-order ^ processing
author
Jon Seymour
<jon.seymour@gmail.com>
Wed, 29 Jun 2005 23:45:30 +0000
(09:45 +1000)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 03:53:10 +0000
(20:53 -0700)
Added a test case that shows that --merge-order doesn't produce the
correct result in the following case.
A
|
| B
|/
C
|
D
git-rev-list --merge-order A ^B should produce just A. Instead
it produces BCD.
A subsequent patch will fix this defect.
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:
f3a3214
)
diff --git
a/t/t6001-rev-list-merge-order.sh
b/t/t6001-rev-list-merge-order.sh
index 4263db5876f2594027cf6eed3b7bf01a7849812e..29167e9a7799a2d4a224075f62239717c89981c4 100755
(executable)
--- a/
t/t6001-rev-list-merge-order.sh
+++ b/
t/t6001-rev-list-merge-order.sh
@@
-543,6
+543,11
@@
test_output_expect_success 'simple merge order (r1l5)' 'git-rev-list --merge-ord
= alt_root
EOF
+test_output_expect_success "don't print things unreachable from one branch" "git-rev-list a3 ^b3 --merge-order" <<EOF
+a3
+a2
+a1
+EOF
#
#