summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-19 19:40:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-19 19:40:17 (GMT)
commit4f26c39806ee69bd68d6ea04b147eb2d877d0172 (patch)
tree205996e02a0d60a2670ceba8d0946afbffa0bb15 /t
parentfe4ce3a72140d32d82aec860c8eb319a78205de6 (diff)
parentaadd44404baab7b1f7234c8815bfd1e6c980cd99 (diff)
downloadgit-4f26c39806ee69bd68d6ea04b147eb2d877d0172.zip
git-4f26c39806ee69bd68d6ea04b147eb2d877d0172.tar.gz
git-4f26c39806ee69bd68d6ea04b147eb2d877d0172.tar.bz2
Merge branch 'ef/maint-fast-export' into maint
* ef/maint-fast-export: builtin-fast-export.c: handle nested tags builtin-fast-export.c: fix crash on tagged trees builtin-fast-export.c: turn error into warning test-suite: adding a test for fast-export with tag variants
Diffstat (limited to 't')
-rwxr-xr-xt/t9301-fast-export.sh15
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh
index 86c3760..4a87f36 100755
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -259,4 +259,19 @@ test_expect_success 'cope with tagger-less tags' '
'
+test_expect_success 'set-up a few more tags for tag export tests' '
+ git checkout -f master &&
+ HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` &&
+ git tag tree_tag -m "tagging a tree" $HEAD_TREE &&
+ git tag -a tree_tag-obj -m "tagging a tree" $HEAD_TREE &&
+ git tag tag-obj_tag -m "tagging a tag" tree_tag-obj &&
+ git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
+'
+
+# NEEDSWORK: not just check return status, but validate the output
+test_expect_success 'tree_tag' 'git fast-export tree_tag'
+test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'
+test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag'
+test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
+
test_done