Merge branch 'jc/post-simplify' (early part) into tr/filter-branch

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index 8cd39da2effa144721851097afe6d503e3c255e1..db2ab2b11a39c295373488f6ff28c1340a9a666d 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1518,7 +1518,10 @@ static void simplify_merges(struct rev_info *revs)
        struct commit_list *list;
        struct commit_list *yet_to_do, **tail;
 
-       sort_in_topological_order(&revs->commits, revs->lifo);
+       if (!revs->topo_order)
+               sort_in_topological_order(&revs->commits, revs->lifo);
+       if (!revs->prune)
+               return;
 
        /* feed the list reversed */
        yet_to_do = NULL;