Andrew's git / gitweb.git / blobdiff
?
Merge branch 'en/abort-df-conflict-fixes'
[gitweb.git] / t / t9811-git-p4-label-import.sh
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh
index decb66ba30871573eb9c252e56599d47095f0fff..602b0a5d5ceafcac6439491b463fee7867e7036f 100755 (executable)
--- a/t/t9811-git-p4-label-import.sh
+++ b/t/t9811-git-p4-label-import.sh
@@ -133,7 +133,7 @@ test_expect_success 'export git tags to p4' '
                p4 labels ... | grep LIGHTWEIGHT_TAG &&
                p4 label -o GIT_TAG_1 | grep "tag created in git:xyzzy" &&
                p4 sync ...@GIT_TAG_1 &&
-               ! test -f main/f10
+               ! test -f main/f10 &&
                p4 sync ...@GIT_TAG_2 &&
                test -f main/f10
        )