diff options
| author | Luke Diamand <luke@diamand.org> | 2015-04-04 09:46:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-04 12:41:51 -0700 |
| commit | d077c2db8db64c931976391afee6c35828868a11 (patch) | |
| tree | c7b26d4f5b76e2c4b03d42390cd4fa4c6aa8f726 /t/t9816-git-p4-locked.sh | |
| parent | 2cce675a631991884899626dd1c1b3d0195518fe (diff) | |
| download | git-d077c2db8db64c931976391afee6c35828868a11.tar.gz git-d077c2db8db64c931976391afee6c35828868a11.tar.xz | |
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>
Diffstat (limited to 't/t9816-git-p4-locked.sh')
| -rwxr-xr-x | t/t9816-git-p4-locked.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh index ce0eb225e..464f10bd4 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 |