mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ld/p4-filetype-detection'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2015-05-05 21:00:27 -07:00
parent e971a1f9d5 34a0dbfc6b
commit a9d00b662f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t9816-git-p4-locked.sh
View File

@ -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