fast-export: fix regression skipping some merge-commits

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 796d0cd66c7750a20613dea77cd75b1b8e7665a4..2fc3e768356a55b4e94580f01875d45044e41998 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -651,8 +651,11 @@ static void handle_tail(struct object_array *commits, struct rev_info *revs,
        struct commit *commit;
        while (commits->nr) {
                commit = (struct commit *)object_array_pop(commits);
-               if (has_unshown_parent(commit))
+               if (has_unshown_parent(commit)) {
+                       /* Queue again, to be handled later */
+                       add_object_array(&commit->object, NULL, commits);
                        return;
+               }
                handle_commit(commit, revs, paths_of_changed_objects);
        }
 }