Merge branch 'nd/grep-exclude-standard-help-fix' into maint

diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 62fbd7e6649d9215528a83249f1b46735de2237d..e4f10c0f68b94bfa719c3d208f622541506c86b3 100755 (executable)
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -318,7 +318,7 @@ test_expect_success 'clone myhost:src uses ssh' '
        expect_ssh myhost src
 '
 
-test_expect_success NOT_MINGW,NOT_CYGWIN 'clone local path foo:bar' '
+test_expect_success !MINGW,!CYGWIN 'clone local path foo:bar' '
        cp -R src "foo:bar" &&
        git clone "foo:bar" foobar &&
        expect_ssh none
@@ -339,7 +339,7 @@ test_clone_url () {
        expect_ssh "$2" "$3"
 }
 
-test_expect_success NOT_MINGW 'clone c:temp is ssl' '
+test_expect_success !MINGW 'clone c:temp is ssl' '
        test_clone_url c:temp c temp
 '
 
@@ -430,4 +430,11 @@ test_expect_success 'clone from a repository with two identical branches' '
 
 '
 
+test_expect_success 'shallow clone locally' '
+       git clone --depth=1 --no-local src ssrrcc &&
+       git clone ssrrcc ddsstt &&
+       test_cmp ssrrcc/.git/shallow ddsstt/.git/shallow &&
+       ( cd ddsstt && git fsck )
+'
+
 test_done