@matheusbsbs / matheus-bagliano / commits / 2374502c6c
Fork 0

fast-export: Make sure we show actual ref names instead of "(null)"

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Jun 25, 2009 at 22:48 UTC 2374502c6ca1c8007cb35682f13fb5db044df9ea
1 file changed +1 -4
builtin-fast-export.c
+1 -4
@@ -530,6 +530,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
530
531 init_revisions(&revs, prefix);
532 revs.topo_order = 1;
533 + revs.show_source = 1;
534 argc = setup_revisions(argc, argv, &revs, NULL);
535 argc = parse_options(argc, argv, prefix, options, fast_export_usage, 0);
536 if (argc > 1)
@@ -546,11 +547,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
547 DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
548 while ((commit = get_revision(&revs))) {
549 if (has_unshown_parent(commit)) {
549 - struct commit_list *parent = commit->parents;
550 add_object_array(&commit->object, NULL, &commits);
551 - for (; parent; parent = parent->next)
552 - if (!parent->item->util)
553 - parent->item->util = commit->util;
551 }
552 else {
553 handle_commit(commit, &revs);