From 784f8affe4dfc8ceec93803d6c22b4b8467a4642 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 10 Feb 2009 23:03:53 -0700 Subject: [PATCH] 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 Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- builtin-fast-export.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 838633808..cdb7df5ef 100644 --- 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); + revs.topo_order = 1; if (prepare_revision_walk(&revs)) die("revision walk setup failed"); revs.diffopt.format_callback = show_filemodify; -- 2.30.2