Merge branch 'ab/compat-regex'

diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index dc9150a71f70e76a89c3ef5e4a715c8fba69e01c..3d4f85d74f6f378d76bde77e581273af010ba452 100755 (executable)
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -67,6 +67,11 @@ test_expect_success 'status with untracked file in submodule' '
        grep "modified:   sub (untracked content)" output
 '
 
+test_expect_success 'status -uno with untracked file in submodule' '
+       git status -uno >output &&
+       grep "^nothing to commit" output
+'
+
 test_expect_success 'status with untracked file in submodule (porcelain)' '
        git status --porcelain >output &&
        diff output - <<-\EOF
@@ -152,6 +157,22 @@ test_expect_success 'status with added and untracked file in modified submodule
        EOF
 '
 
+test_expect_success 'setup .git file for sub' '
+       (cd sub &&
+        rm -f new-file
+        REAL="$(pwd)/../.real" &&
+        mv .git "$REAL"
+        echo "gitdir: $REAL" >.git) &&
+        echo .real >>.gitignore &&
+        git commit -m "added .real to .gitignore" .gitignore
+'
+
+test_expect_success 'status with added file in modified submodule with .git file' '
+       (cd sub && git reset --hard && echo >foo && git add foo) &&
+       git status >output &&
+       grep "modified:   sub (new commits, modified content)" output
+'
+
 test_expect_success 'rm submodule contents' '
        rm -rf sub/* sub/.git
 '