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>
Elijah Newren committed
Feb 10, 2009 at 23:03 UTC
784f8affe4dfc8ceec93803d6c22b4b8467a4642
1 file changed
+1
builtin-fast-export.c
+1
@@ -511,6 +511,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
511
512
get_tags_and_duplicates(&revs.pending, &extra_refs);
513
514
+ revs.topo_order = 1;
515
if (prepare_revision_walk(&revs))
516
die("revision walk setup failed");
517
revs.diffopt.format_callback = show_filemodify;