Fourth batch

diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 1fa2ff29093b7728dcaec367515fbb48ff265de0..08629a6e702999a2af0deccd6558a01a9d881c3f 100755 (executable)
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -18,7 +18,7 @@ test_create_repo_with_commit () {
 }
 
 sanitize_output () {
-       sed -e "s/$_x40/HASH/" -e "s/$_x40/HASH/" output >output2 &&
+       sed -e "s/$OID_REGEX/HASH/" -e "s/$OID_REGEX/HASH/" output >output2 &&
        mv output2 output
 }
 
@@ -193,9 +193,9 @@ test_expect_success 'status with added and untracked file in modified submodule
 
 test_expect_success 'setup .git file for sub' '
        (cd sub &&
-        rm -f new-file
+        rm -f new-file &&
         REAL="$(pwd)/../.real" &&
-        mv .git "$REAL"
+        mv .git "$REAL" &&
         echo "gitdir: $REAL" >.git) &&
         echo .real >>.gitignore &&
         git commit -m "added .real to .gitignore" .gitignore
@@ -209,12 +209,12 @@ test_expect_success 'status with added file in modified submodule with .git file
 
 test_expect_success 'status with a lot of untracked files in the submodule' '
        (
-               cd sub
+               cd sub &&
                i=0 &&
                while test $i -lt 1024
                do
-                       >some-file-$i
-                       i=$(( $i + 1 ))
+                       >some-file-$i &&
+                       i=$(( $i + 1 )) || exit 1
                done
        ) &&
        git status --porcelain sub 2>err.actual &&
@@ -306,7 +306,7 @@ test_expect_success 'diff with merge conflict in .gitmodules' '
                cd super &&
                git diff >../diff_actual 2>&1
        ) &&
-       test_cmp diff_actual diff_expect
+       test_cmp diff_expect diff_actual
 '
 
 test_expect_success 'diff --submodule with merge conflict in .gitmodules' '
@@ -314,7 +314,7 @@ test_expect_success 'diff --submodule with merge conflict in .gitmodules' '
                cd super &&
                git diff --submodule >../diff_submodule_actual 2>&1
        ) &&
-       test_cmp diff_submodule_actual diff_submodule_expect
+       test_cmp diff_submodule_expect diff_submodule_actual
 '
 
 # We'll setup different cases for further testing:
@@ -325,7 +325,8 @@ test_expect_success 'setup superproject with untracked file in nested submodule'
        (
                cd super &&
                git clean -dfx &&
-               rm .gitmodules &&
+               git rm .gitmodules &&
+               git commit -m "remove .gitmodules" &&
                git submodule add -f ./sub1 &&
                git submodule add -f ./sub2 &&
                git submodule add -f ./sub1 sub3 &&
@@ -356,7 +357,7 @@ test_expect_success 'status with untracked file in nested submodule (porcelain=2
        git -C super status --porcelain=2 >output &&
        sanitize_output output &&
        diff output - <<-\EOF
-       1 .M S.M. 160000 160000 160000 HASH HASH sub1
+       1 .M S..U 160000 160000 160000 HASH HASH sub1
        1 .M S..U 160000 160000 160000 HASH HASH sub2
        1 .M S..U 160000 160000 160000 HASH HASH sub3
        EOF
@@ -365,7 +366,7 @@ test_expect_success 'status with untracked file in nested submodule (porcelain=2
 test_expect_success 'status with untracked file in nested submodule (short)' '
        git -C super status --short >output &&
        diff output - <<-\EOF
-        m sub1
+        ? sub1
         ? sub2
         ? sub3
        EOF