Skip to content

Commit

Permalink
git-p4: small fix for locked-file-move-test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luke Diamand authored and Junio C Hamano committed Apr 4, 2015
1 parent 2cce675 commit d077c2d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t9816-git-p4-locked.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d077c2d

Please sign in to comment.