Code

Merge branch 'jc/maint-verify-objects-remove-pessimism'
[git.git] / t / t9801-git-p4-branch.sh
index 6ff713b1f709df5f17ddb4e054997f298cd6cddd..d41470541650590355bf0de1a1b556b3502492b5 100755 (executable)
@@ -208,7 +208,7 @@ test_expect_success 'git-p4 clone simple branches' '
                test -f file1 &&
                test -f file2 &&
                test ! -f file3 &&
-               test_must_fail grep update file2 &&
+               ! grep update file2 &&
                git reset --hard p4/depot/branch3 &&
                test -f file1 &&
                test -f file2 &&
@@ -286,7 +286,7 @@ test_expect_success 'git-p4 clone complex branches' '
                test_path_is_file file1 &&
                test_path_is_file file2 &&
                test_path_is_missing file3 &&
-               test_must_fail grep update file2 &&
+               ! grep update file2 &&
                git reset --hard p4/depot/branch3 &&
                test_path_is_file file1 &&
                test_path_is_file file2 &&
@@ -296,12 +296,12 @@ test_expect_success 'git-p4 clone complex branches' '
                test_path_is_file file1 &&
                test_path_is_file file2 &&
                test_path_is_missing file3 &&
-               test_must_fail grep update file2 &&
+               ! grep update file2 &&
                git reset --hard p4/depot/branch5 &&
                test_path_is_file file1 &&
                test_path_is_file file2 &&
                test_path_is_file file3 &&
-               test_must_fail grep update file2 &&
+               ! grep update file2 &&
                test_path_is_missing .git/git-p4-tmp
        )
 '