From: Jon Seymour Date: Thu, 30 Jun 2005 01:51:34 +0000 (+1000) Subject: [PATCH] Fix for git-rev-list --merge-order B ^A (A,B share common base) [rev 2] X-Git-Tag: v0.99~116 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/99c2bc93000dfadc3ac26ddced23e50520cf30d0?ds=inline;hp=99c2bc93000dfadc3ac26ddced23e50520cf30d0 [PATCH] Fix for git-rev-list --merge-order B ^A (A,B share common base) [rev 2] This patch makes --merge-order produce the same list as git-rev-list without --merge-order specified. In particular, if the graph looks like this: A | B |/ C | D The both git-rev-list B ^A and git-rev-list --merge-order will produce B. The unit tests have been changed to reflect the fact that the prune points are now formally part of the start list that is used to perform the --merge-order sort. That is: git-rev-list --merge-order A ^D used to produce = A | C It now produces: ^ A | C Signed-off-by: Jon Seymour Signed-off-by: Linus Torvalds ---