Merge branch 'nd/magic-pathspec'

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index d0444d3054d5126c7cd73f421236f0f0fa82b241..c987b5ed652b977cc2169bdd4c64f42eccdf63db 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -61,7 +61,8 @@ test_expect_success 'status (1)' '
 '
 
 strip_comments () {
-       sed "s/^\# //; s/^\#$//; s/^#\t/\t/" <"$1" >"$1".tmp &&
+       tab='   '
+       sed "s/^\# //; s/^\#$//; s/^#$tab/$tab/" <"$1" >"$1".tmp &&
        rm "$1" && mv "$1".tmp "$1"
 }
 
@@ -84,6 +85,7 @@ test_expect_success 'status --column' '
 #
 #      dir1/untracked dir2/untracked output
 #      dir2/modified  expect         untracked
+#
 EOF
        COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
        test_i18ncmp expect output
@@ -117,6 +119,7 @@ cat >expect <<\EOF
 #      expect
 #      output
 #      untracked
+#
 EOF
 
 test_expect_success 'status with status.displayCommentPrefix=true' '
@@ -167,6 +170,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
 
 test_expect_success 'status (advice.statusHints false)' '
@@ -241,6 +245,7 @@ Untracked files:
   (use "git add <file>..." to include in what will be committed)
 
        dir2/modified
+
 Ignored files:
   (use "git add -f <file>..." to include in what will be committed)
 
@@ -250,6 +255,7 @@ Ignored files:
        expect
        output
        untracked
+
 EOF
        git status --ignored >output &&
        test_i18ncmp expect output
@@ -308,6 +314,7 @@ Ignored files:
        expect
        output
        untracked
+
 EOF
        git status --ignored >output &&
        test_i18ncmp expect output
@@ -430,6 +437,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        git status -unormal >output &&
        test_i18ncmp expect output
@@ -488,6 +496,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        git status -uall >output &&
        test_i18ncmp expect output
@@ -548,6 +557,7 @@ Untracked files:
        ../expect
        ../output
        ../untracked
+
 EOF
        (cd dir1 && git status) >output &&
        test_i18ncmp expect output
@@ -618,6 +628,7 @@ Untracked files:
        <BLUE>expect<RESET>
        <BLUE>output<RESET>
        <BLUE>untracked<RESET>
+
 EOF
        test_config color.ui always &&
        git status | test_decode_color >output &&
@@ -747,6 +758,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        test_config status.relativePaths false &&
        (cd dir1 && git status) >output &&
@@ -789,6 +801,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        git commit --dry-run dir1/modified >output &&
        test_i18ncmp expect output
@@ -838,6 +851,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        git status >output &&
        test_i18ncmp expect output
@@ -902,6 +916,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        git config status.submodulesummary 10 &&
        git status >output &&
@@ -952,6 +967,7 @@ Untracked files:
        expect
        output
        untracked
+
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
        git commit -m "commit submodule" &&
@@ -978,7 +994,7 @@ test_expect_success 'status -s submodule summary (clean submodule)' '
 
 test_expect_success 'status -z implies porcelain' '
        git status --porcelain |
-       "$PERL_PATH" -pe "s/\012/\000/g" >expect &&
+       perl -pe "s/\012/\000/g" >expect &&
        git status -z >output &&
        test_cmp expect output
 '
@@ -1012,6 +1028,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        git config status.submodulesummary 10 &&
        git commit --dry-run --amend >output &&
@@ -1066,6 +1083,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        echo modified  sm/untracked &&
        git status --ignore-submodules=untracked >output &&
@@ -1177,6 +1195,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        git status --ignore-submodules=untracked > output &&
        test_i18ncmp expect output
@@ -1238,6 +1257,7 @@ Untracked files:
        expect
        output
        untracked
+
 EOF
        git status --ignore-submodules=untracked > output &&
        test_i18ncmp expect output
@@ -1319,6 +1339,7 @@ cat > expect << EOF
 ;      expect
 ;      output
 ;      untracked
+;
 EOF
 
 test_expect_success "status (core.commentchar with submodule summary)" '
@@ -1352,13 +1373,14 @@ Untracked files:
        expect
        output
        untracked
+
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
        git status --ignore-submodules=all > output &&
        test_i18ncmp expect output
 '
 
-test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
+test_expect_success '.gitmodules ignore=all suppresses submodule summary' '
        git config --add -f .gitmodules submodule.subname.ignore all &&
        git config --add -f .gitmodules submodule.subname.path sm &&
        git status > output &&
@@ -1366,7 +1388,7 @@ test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
        git config -f .gitmodules  --remove-section submodule.subname
 '
 
-test_expect_failure '.git/config ignore=all suppresses submodule summary' '
+test_expect_success '.git/config ignore=all suppresses submodule summary' '
        git config --add -f .gitmodules submodule.subname.ignore none &&
        git config --add -f .gitmodules submodule.subname.path sm &&
        git config --add submodule.subname.ignore all &&