[PATCHv2 2/4] git-p4: small fix for locked-file-move-test
- From
Luke Diamand <luke@diamand.org>
- Date
- Apr 3, 2015, 18:53 UTC
- Message-ID
- <1428087218-8186-3-git-send-email-luke@diamand.org>
- In-Reply-To
- <1428087218-8186-1-git-send-email-luke@diamand.org>
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> --- t/t9816-git-p4-locked.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh index ce0eb22..464f10b 100755 --- a/t/t9816-git-p4-locked.sh +++ b/t/t9816-git-p4-locked.sh @@ -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
-- 2.3.0.rc1.30.g76afe74