projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f3a3214) | patch
[PATCH] Test case that demonstrates problem with --merge-order ^ processing
authorJon Seymour <jon.seymour@gmail.com>
Wed, 29 Jun 2005 23:45:30 +0000 (09:45 +1000)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 03:53:10 +0000 (20:53 -0700)
commitda4b932a0c5b249694216b1580b7bc2ded9e0280
tree5a1cad9b859d06d0397bd56b5b1a7b1a6cd98328tree | snapshot
parentf3a3214e83be2905c57eff5d9035d169cae4644ecommit | diff
[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>
t/t6001-rev-list-merge-order.sh diff | blob | history
The core git plumbing