From: newren@gmail.com
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, Elijah Newren <newren@gmail.com>
Subject: [PATCH] fast-export: ensure we traverse commits in topological order
Date: Tue, 10 Feb 2009 23:03:53 -0700 [thread overview]
Message-ID: <1234332233-10017-2-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <1234332233-10017-1-git-send-email-newren@gmail.com>
From: Elijah Newren <newren@gmail.com>
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>
---
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
next prev parent reply other threads:[~2009-02-11 6:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-11 6:03 [PATCH] Add new testcase to show that fast-export can squash merge commits newren
2009-02-11 6:03 ` newren [this message]
2009-02-11 10:25 ` [PATCH] fast-export: ensure we traverse commits in topological order Johannes Schindelin
2009-02-11 10:48 ` Mike Ralphson
2009-02-11 10:59 ` Johannes Schindelin
2009-02-11 13:56 ` Jeff King
2009-02-11 15:18 ` Johannes Schindelin
2009-02-11 17:37 ` Jeff King
2009-02-11 15:23 ` Elijah Newren
2009-02-11 17:53 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1234332233-10017-2-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).