Skip to content

Commit

Permalink
fast-export: ensure we traverse commits in topological order
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Elijah Newren authored and Junio C Hamano committed Feb 12, 2009
1 parent fa3a0c9 commit 784f8af
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions builtin-fast-export.c
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)

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;
Expand Down

0 comments on commit 784f8af

Please sign in to comment.