Sync with 1.8.3.1

diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
index 4e7030e61311de6fa8d7e3b4026de0e2009a5dc0..3f8705139d74e8e358ae60cabe5d1cd92d316489 100755 (executable)
--- a/t/t1060-object-corruption.sh
+++ b/t/t1060-object-corruption.sh
@@ -79,7 +79,7 @@ test_expect_success 'clone --no-local --bare detects missing object' '
        test_must_fail git clone --no-local --bare missing missing-transport
 '
 
-test_expect_failure 'clone --no-local --bare detects misnamed object' '
+test_expect_success 'clone --no-local --bare detects misnamed object' '
        test_must_fail git clone --no-local --bare misnamed misnamed-transport
 '
 
@@ -89,6 +89,10 @@ test_expect_success 'clone --local detects corruption' '
        test_must_fail git clone --local bit-error corrupt-checkout
 '
 
+test_expect_success 'error detected during checkout leaves repo intact' '
+       test_path_is_dir corrupt-checkout/.git
+'
+
 test_expect_success 'clone --local detects missing objects' '
        test_must_fail git clone --local missing missing-checkout
 '