Merge branch 'jc/cvsserver-perm-bit-fix' into maint

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 5d22f17ca2d3469c7542805e365246a70a5fba64..debda7a678277e1198ba6620210b66984caf03a2 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -673,22 +673,4 @@ test_expect_success 'store updates stash ref and reflog' '
        grep quux bazzy
 '
 
-test_expect_success 'stash a change to turn a non-directory to a directory' '
-       git reset --hard &&
-       >testfile &&
-       git add testfile &&
-       git commit -m "add testfile as a regular file" &&
-       rm testfile &&
-       mkdir testfile &&
-       >testfile/file &&
-       test_must_fail git stash save "recover regular file" &&
-       test -f testfile/file
-'
-
-test_expect_success 'stash a change to turn a non-directory to a directory (forced)' '
-       git stash save --force "recover regular file (forced)" &&
-       ! test -f testfile/file &&
-       test -f testfile
-'
-
 test_done