Skip to content

Commit d077c2d

Browse files
luked99gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2cce675 commit d077c2d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t9816-git-p4-locked.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ test_expect_failure 'move with lock taken' '
130130
git p4 clone --dest="$git" //depot &&
131131
(
132132
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" &&
135135
git config git-p4.skipSubmitEdit true &&
136136
git config git-p4.detectRenames true &&
137137
git p4 submit --verbose

0 commit comments

Comments
 (0)