diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:27 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:28 -0700 |
commit | a9d00b662f0fdb88434b85d2bd55ebfee227e0d7 (patch) | |
tree | 07d96aeadb52c7ac626a9a1adaa4ac952b62f5f5 /t/t9816-git-p4-locked.sh | |
parent | Merge branch 'ts/checkout-advice-plural' (diff) | |
parent | git-p4: fix filetype detection on files opened exclusively (diff) | |
download | tgif-a9d00b662f0fdb88434b85d2bd55ebfee227e0d7.tar.xz |
Merge branch 'ld/p4-filetype-detection'
* ld/p4-filetype-detection:
git-p4: fix filetype detection on files opened exclusively
git-p4: small fix for locked-file-move-test
git-p4: fix small bug in locked test scripts
Diffstat (limited to 't/t9816-git-p4-locked.sh')
-rwxr-xr-x | t/t9816-git-p4-locked.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh index e71e543343..d048bd33fa 100755 --- a/t/t9816-git-p4-locked.sh +++ b/t/t9816-git-p4-locked.sh @@ -35,13 +35,13 @@ test_expect_success 'edit with lock not taken' ' ) ' -test_expect_failure 'add with lock not taken' ' +test_expect_success 'add with lock not taken' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( cd "$git" && echo line1 >>add-lock-not-taken && - git add file2 && + git add add-lock-not-taken && git commit -m "add add-lock-not-taken" && git config git-p4.skipSubmitEdit true && git p4 submit --verbose @@ -107,7 +107,7 @@ test_expect_failure 'chmod with lock taken' ' ) ' -test_expect_failure 'copy with lock taken' ' +test_expect_success 'copy with lock taken' ' lock_in_another_client && test_when_finished cleanup_git && test_when_finished "cd \"$cli\" && p4 revert file2 && rm -f file2" && @@ -130,8 +130,8 @@ test_expect_failure 'move with lock taken' ' git p4 clone --dest="$git" //depot && ( cd "$git" && - git mv file1 file2 && - git commit -m "mv file1 to file2" && + git mv file1 file3 && + git commit -m "mv file1 to file3" && git config git-p4.skipSubmitEdit true && git config git-p4.detectRenames true && git p4 submit --verbose |