Skip to content

Commit 2374502

Browse files
newrengitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 02c48cd commit 2374502

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

builtin-fast-export.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
530530

531531
init_revisions(&revs, prefix);
532532
revs.topo_order = 1;
533+
revs.show_source = 1;
533534
argc = setup_revisions(argc, argv, &revs, NULL);
534535
argc = parse_options(argc, argv, prefix, options, fast_export_usage, 0);
535536
if (argc > 1)
@@ -546,11 +547,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
546547
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
547548
while ((commit = get_revision(&revs))) {
548549
if (has_unshown_parent(commit)) {
549-
struct commit_list *parent = commit->parents;
550550
add_object_array(&commit->object, NULL, &commits);
551-
for (; parent; parent = parent->next)
552-
if (!parent->item->util)
553-
parent->item->util = commit->util;
554551
}
555552
else {
556553
handle_commit(commit, &revs);

0 commit comments

Comments
 (0)