diff options
| author |  Luke Diamand <luke@diamand.org> | 2015-04-04 09:46:01 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-04-04 12:41:41 -0700 |
| commit | 2cce675a631991884899626dd1c1b3d0195518fe (patch) | |
| tree | a2b9257ce85842c35492f681e6f2a2e0b78b6846 | |
| parent | Git 2.4.0-rc1 (diff) | |
| download | tgif-2cce675a631991884899626dd1c1b3d0195518fe.tar.xz | |
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 <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9816-git-p4-locked.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh index e71e543343..ce0eb225ea 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 |