On Fri, Apr 3, 2015 at 2:53 PM, Luke Diamand <l...@diamand.org> wrote: > Test script t9816-git-p4-locked.sh test #4 tests for > adding a file that is locked by Perforce automatially.
s/automatially/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 <l...@diamand.org> > --- > t/t9816-git-p4-locked.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh > index e71e543..ce0eb22 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 > -- > 2.3.0.rc1.30.g76afe74 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
