Merge branch 'cb/mkstemps-uint-type-fix' into maint

diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 943708fb04a114bc020d33cbf21b4e4e62e805bd..08629a6e702999a2af0deccd6558a01a9d881c3f 100755 (executable)
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -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 &&