diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-17 15:21:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-17 15:21:46 -0700 |
| commit | 9b994b1c4e87008582fa5f57121f73f4fc940054 (patch) | |
| tree | 2029f27353cf1d190649d8e38cb7c6349c5431e6 /t | |
| parent | 2b26b65f9abc77c4af87626452005a73edda0c8f (diff) | |
| parent | 06dcd152a81ccff5464c34ed95306196763c9e65 (diff) | |
| download | git-9b994b1c4e87008582fa5f57121f73f4fc940054.tar.gz git-9b994b1c4e87008582fa5f57121f73f4fc940054.tar.xz | |
Merge branch 'ld/git-p4-tags-and-labels'
By Luke Diamand
* ld/git-p4-tags-and-labels:
git p4: fix bug when enabling tag import/export via config variables
git p4: fix bug when verbose enabled with tag export
git p4: add test for tag import/export enabled via config
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9811-git-p4-label-import.sh | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh index fb00ffab2..095238fff 100755 --- a/t/t9811-git-p4-label-import.sh +++ b/t/t9811-git-p4-label-import.sh @@ -195,6 +195,26 @@ test_expect_success 'tag that cannot be exported' ' ) ' +test_expect_success 'use git config to enable import/export of tags' ' + git p4 clone --verbose --dest="$git" //depot@all && + ( + cd "$git" && + git config git-p4.exportLabels true && + git config git-p4.importLabels true && + git tag CFG_A_GIT_TAG && + git p4 rebase --verbose && + git p4 submit --verbose && + git tag && + git tag | grep TAG_F1_1 + ) && + ( + cd "$cli" && + p4 labels && + p4 labels | grep CFG_A_GIT_TAG + ) +' + + test_expect_success 'kill p4d' ' kill_p4d ' |