From: Elijah Newren Date: Fri, 26 Jun 2009 04:48:27 +0000 (-0600) Subject: fast-export: Set revs.topo_order before calling setup_revisions X-Git-Tag: v1.6.4~7^2~6 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=668f3aa776bcd293de08413bf1b25b91c15f1b01;p=git.git fast-export: Set revs.topo_order before calling setup_revisions setup_revisions sets a variety of flags based on the setting of other flags, such as setting the limited flag when topo_order is set. To avoid circumventing any invariants created by setup_revisions, we set revs.topo_order before calling it rather than after. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 6cef81031..e0cfa606d 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) git_config(git_default_config, NULL); init_revisions(&revs, prefix); + revs.topo_order = 1; argc = setup_revisions(argc, argv, &revs, NULL); argc = parse_options(argc, argv, prefix, options, fast_export_usage, 0); if (argc > 1) @@ -524,7 +525,6 @@ 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;