From: Elijah Newren Date: Wed, 11 Feb 2009 06:03:53 +0000 (-0700) Subject: fast-export: ensure we traverse commits in topological order X-Git-Tag: v1.6.2-rc1~24^2~1^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/784f8affe4dfc8ceec93803d6c22b4b8467a4642?ds=inline;hp=--cc 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 --- 784f8affe4dfc8ceec93803d6c22b4b8467a4642 diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 838633808c..cdb7df5efe 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;