From: Luke Diamand Date: Sat, 4 Apr 2015 08:46:01 +0000 (+0100) Subject: git-p4: fix small bug in locked test scripts X-Git-Tag: v2.5.0-rc0~155^2~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2cce675a631991884899626dd1c1b3d0195518fe;p=git-core%2Fgit.git git-p4: fix small bug in locked test scripts Test script t9816-git-p4-locked.sh test #4 tests for adding a file that is locked by Perforce automatically. This is currently not supported by git-p4 and so is expected to fail. However, a small typo meant it always failed, even with a fixed git-p4. Fix the typo to resolve this. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano --- diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh index e71e54334..ce0eb225e 100755 --- a/t/t9816-git-p4-locked.sh +++ b/t/t9816-git-p4-locked.sh @@ -41,7 +41,7 @@ test_expect_failure 'add with lock not taken' ' ( cd "$git" && echo line1 >>add-lock-not-taken && - git add file2 && + git add add-lock-not-taken && git commit -m "add add-lock-not-taken" && git config git-p4.skipSubmitEdit true && git p4 submit --verbose