From: newren@gmail.com Date: Wed, 11 Feb 2009 06:03:53 GMT Subject: [PATCH] fast-export: ensure we traverse commits in topological order Message-ID: <1234332233-10017-2-git-send-email-newren@gmail.com> In-Reply-To: <1234332233-10017-1-git-send-email-newren@gmail.com> From: Elijah Newren 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 --- builtin-fast-export.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/builtin-fast-export.c b/builtin-fast-export.c index e9ee2c7..fdf4ae9 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -514,6 +514,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; -- 1.6.0.6