Merge branch 'jl/doc-submodule-update-checkout'

diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index e4bb3a14570780b41ce4ebea9e47870d4cbcb127..66c9a41739e5d75633a239c55fd516341f8a98e3 100755 (executable)
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -221,4 +221,14 @@ EOF
        test_cmp expected actual
 '
 
+test_expect_success 'prune .git/shallow' '
+       SHA1=`echo hi|git commit-tree HEAD^{tree}` &&
+       echo $SHA1 >.git/shallow &&
+       git prune --dry-run >out &&
+       grep $SHA1 .git/shallow &&
+       grep $SHA1 out &&
+       git prune &&
+       ! test -f .git/shallow
+'
+
 test_done