diff options
| author |  Jon Seymour <jon.seymour@gmail.com> | 2005-06-30 09:45:30 +1000 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 20:53:10 -0700 |
| commit | da4b932a0c5b249694216b1580b7bc2ded9e0280 (patch) | |
| tree | 5a1cad9b859d06d0397bd56b5b1a7b1a6cd98328 | |
| parent | Make send/receive-pack be closer to doing something interesting (diff) | |
| download | tgif-da4b932a0c5b249694216b1580b7bc2ded9e0280.tar.xz | |
[PATCH] Test case that demonstrates problem with --merge-order ^ processing
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>
| -rwxr-xr-x | t/t6001-rev-list-merge-order.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 4263db5876..29167e9a77 100755 --- 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 # # |