aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-27 19:23:27 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-27 19:23:27 -0800
commit539eec48f0a101b45c5f150a2bbc067fd85bc96d (patch)
treebd7134cfb57be91b518be6cbaf21436c664cc993
parent35243577ab460d0b97b97948928d47f71dc8e46a (diff)
parent2075ffb58e3a2d46d9e7606010f7f943f2295376 (diff)
downloadgit-539eec48f0a101b45c5f150a2bbc067fd85bc96d.tar.gz
git-539eec48f0a101b45c5f150a2bbc067fd85bc96d.tar.xz
Merge branch 'mv/fast-export' into maint
* mv/fast-export: fast-export: use an unsorted string list for extra_refs Add new testcase to show fast-export does not always exports all tags
-rw-r--r--builtin-fast-export.c4
-rwxr-xr-xt/t9301-fast-export.sh8
2 files changed, 10 insertions, 2 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 7c93eb878..7d5d57ad7 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -354,7 +354,7 @@ static void get_tags_and_duplicates(struct object_array *pending,
case OBJ_TAG:
tag = (struct tag *)e->item;
while (tag && tag->object.type == OBJ_TAG) {
- string_list_insert(full_name, extra_refs)->util = tag;
+ string_list_append(full_name, extra_refs)->util = tag;
tag = (struct tag *)tag->tagged;
}
if (!tag)
@@ -374,7 +374,7 @@ static void get_tags_and_duplicates(struct object_array *pending,
}
if (commit->util)
/* more than one name for the same object */
- string_list_insert(full_name, extra_refs)->util = commit;
+ string_list_append(full_name, extra_refs)->util = commit;
else
commit->util = full_name;
}
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh
index c19b4a2ba..638c858dc 100755
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -231,4 +231,12 @@ test_expect_success 'fast-export -C -C | fast-import' '
'
+test_expect_success 'fast-export | fast-import when master is tagged' '
+
+ git tag -m msg last &&
+ git fast-export -C -C --signed-tags=strip --all > output &&
+ test $(grep -c "^tag " output) = 3
+
+'
+
test_done