Submodules: Don't parse .gitmodules when it contains, merge conflicts

diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
index 782e75d00091ebf1fda93ca5dc8e532289a15638..1b0f82fa4c7928fc4605ccf31a3ae45e6ac9f38e 100755 (executable)
--- a/t/t1402-check-ref-format.sh
+++ b/t/t1402-check-ref-format.sh
@@ -32,7 +32,7 @@ test_expect_success "check-ref-format --branch @{-1}" '
        T=$(git write-tree) &&
        sha1=$(echo A | git commit-tree $T) &&
        git update-ref refs/heads/master $sha1 &&
-       git update-ref refs/remotes/origin/master $sha1
+       git update-ref refs/remotes/origin/master $sha1 &&
        git checkout master &&
        git checkout origin/master &&
        git checkout master &&
@@ -47,7 +47,7 @@ test_expect_success 'check-ref-format --branch from subdir' '
        T=$(git write-tree) &&
        sha1=$(echo A | git commit-tree $T) &&
        git update-ref refs/heads/master $sha1 &&
-       git update-ref refs/remotes/origin/master $sha1
+       git update-ref refs/remotes/origin/master $sha1 &&
        git checkout master &&
        git checkout origin/master &&
        git checkout master &&