From: newren@gmail.com
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, kusmabite@gmail.com,
Elijah Newren <newren@gmail.com>
Subject: [PATCHv3 3/7] fast-export: Make sure we show actual ref names instead of "(null)"
Date: Thu, 25 Jun 2009 22:48:29 -0600 [thread overview]
Message-ID: <1245991713-12782-4-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <1245991713-12782-1-git-send-email-newren@gmail.com>
From: Elijah Newren <newren@gmail.com>
The code expects a ref name to be provided in commit->util. While there
was some code to set commit->util, it only worked in cases where there was
an unbroken chain of revisions from a ref to the relevant commit. In
cases such as running
git fast-export --parents master -- COPYING
commit->util would fail to be set. The old method of setting commit->util
has been removed in favor of requesting show_source from the revision
traversal machinery (related to the "--source" option of "git log" family
of commands.)
However, this change does not fix cases like
git fast export master~1
or
git fast export :/arguments
since in such cases commit->util will be "master~1" or ":/arguments" while
we need the actual ref (e.g. "refs/heads/master")
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Since the last series, some now-obsolete code has been removed. Also,
the commit message now points out two cases that continue to fail with
this patch. For the second of those cases (the :/arguments one), I'm
not sure that I even know what correct behavior would be.
builtin-fast-export.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 8c90a2d..43a7e17 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -530,6 +530,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
init_revisions(&revs, prefix);
revs.topo_order = 1;
+ revs.show_source = 1;
argc = setup_revisions(argc, argv, &revs, NULL);
argc = parse_options(argc, argv, prefix, options, fast_export_usage, 0);
if (argc > 1)
@@ -546,11 +547,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
while ((commit = get_revision(&revs))) {
if (has_unshown_parent(commit)) {
- struct commit_list *parent = commit->parents;
add_object_array(&commit->object, NULL, &commits);
- for (; parent; parent = parent->next)
- if (!parent->item->util)
- parent->item->util = commit->util;
}
else {
handle_commit(commit, &revs);
--
1.6.3.2.323.geb889
next prev parent reply other threads:[~2009-06-26 4:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-26 4:48 A few fast export fixups -- round 3 newren
2009-06-26 4:48 ` [PATCHv3 1/7] fast-export: Set revs.topo_order before calling setup_revisions newren
2009-06-26 4:48 ` [PATCHv3 2/7] fast-export: Omit tags that tag trees newren
2009-06-26 4:48 ` newren [this message]
2009-06-26 4:48 ` [PATCHv3 4/7] fast-export: Do parent rewriting to avoid dropping relevant commits newren
2009-06-26 4:48 ` [PATCHv3 5/7] fast-export: Add a --tag-of-filtered-object option for newly dangling tags newren
2009-06-26 4:48 ` [PATCHv3 6/7] Add new fast-export testcases newren
2009-06-26 4:48 ` [PATCHv3 7/7] fast-export: Document the fact that git-rev-list arguments are accepted newren
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1245991713-12782-4-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).