aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-01 22:49:28 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-01 22:49:28 -0700
commitdffc13166ba8950b2ddbac2406042751f96841b7 (patch)
tree66af1ab857dcce7d829f377f17bb54317eeb118c /t
parent37a13acb2e9ec58c9dd8ee81a48dd4fa6d90ff29 (diff)
parent1982467d9229e3c92157f2a41363365dcb866e86 (diff)
downloadgit-dffc13166ba8950b2ddbac2406042751f96841b7.tar.gz
git-dffc13166ba8950b2ddbac2406042751f96841b7.tar.xz
Merge branch 'ef/fast-export'
* ef/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 b860626be..8da9ce545 100755
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -262,4 +262,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