Merge branch 'pw/rebase-i-regression-fix'

diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 1fa2ff29093b7728dcaec367515fbb48ff265de0..055c90736e9c0cfb60fef7db643f30c7573de581 100755 (executable)
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -356,7 +356,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 +365,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