Skip to content

Commit 784f8af

Browse files
newrengitster
authored andcommitted
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 <[email protected]> Acked-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fa3a0c9 commit 784f8af

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

builtin-fast-export.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
511511

512512
get_tags_and_duplicates(&revs.pending, &extra_refs);
513513

514+
revs.topo_order = 1;
514515
if (prepare_revision_walk(&revs))
515516
die("revision walk setup failed");
516517
revs.diffopt.format_callback = show_filemodify;

0 commit comments

Comments
 (0)