A recent change to rev-list altered the order in which start points
are presented to the merge-order sort algorithm. This caused
breaks in the t/t6001 unit tests.

This change restores the order in which start points are presented to the
the merge-order sort algorithm (but leaves the order unchanged from
the immediately preceding behaviour for non --merge-order sorts).

The order in which arguments are presented to the merge-order
sort algorithm is significant, since left-most arguments
are expected to sort last so as to be consistent with
how left-most parents sort.

Signed-off-by: Jon Seymour <[EMAIL PROTECTED]>

 rev-list.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c
@@ -482,7 +482,10 @@ int main(int argc, char **argv)
                commit = get_commit_reference(arg, flags);
                if (!commit)
-               insert_by_date(&list, commit);
+               if (!merge_order) 
+                       insert_by_date(&list, commit);
+               else
+                       commit_list_insert(commit, &list);
        if (!merge_order) {             
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to