fast-export: ensure we traverse commits in topological order

fast-export will only list as parents those commits which have already
been traversed (making it appear as if merges have been squashed if not
all parents have been traversed).  To avoid this silent squashing of
merge commits, we request commits in topological order.

Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 838633808c3eb4891919aa397716f04fcd4cfe24..cdb7df5efeec9bbe6ec4ef4ab380403ea662bb12 100644 (file)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -511,6 +511,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 
        get_tags_and_duplicates(&revs.pending, &extra_refs);
 
 
        get_tags_and_duplicates(&revs.pending, &extra_refs);
 

+       revs.topo_order = 1;

        if (prepare_revision_walk(&revs))
                die("revision walk setup failed");
        revs.diffopt.format_callback = show_filemodify;
        if (prepare_revision_walk(&revs))
                die("revision walk setup failed");
        revs.diffopt.format_callback = show_filemodify;