git-p4: small fix for locked-file-move-test
The test for handling of failure when trying to move a file that is locked by another client was not quite correct - it failed early on because the target file in the move already existed. The test now fails because git-p4 does not properly detect that p4 has rejected the move, and instead just crashes. At present, git-p4 has no support for detecting that a file has been locked and reporting it to the user, so this is the expected outcome. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Luke Diamand committed
Apr 4, 2015 at 09:46 UTC
d077c2db8db64c931976391afee6c35828868a11
1 file changed
+2
-2
t/t9816-git-p4-locked.sh
+2
-2
@@ -130,8 +130,8 @@ test_expect_failure 'move with lock taken' '
130
git p4 clone --dest="$git" //depot &&
131
(
132
cd "$git" &&
133
- git mv file1 file2 &&
134
- git commit -m "mv file1 to file2" &&
133
+ git mv file1 file3 &&
134
+ git commit -m "mv file1 to file3" &&
135
git config git-p4.skipSubmitEdit true &&
136
git config git-p4.detectRenames true &&
137
git p4 submit --verbose