packed_read_raw_ref(): new function, replacing `resolve_packed_ref()`

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index b58793448b55c3ad339703a4bbe316c5aaf8320b..f8568f8841d34d17f3d8fdae4d8d2404a6693c4d 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -97,9 +97,9 @@ test_expect_success FUNNYNAMES \
 embedded'"
 
 test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
+       test_when_finished "chmod 775 ." &&
        chmod a-w . &&
-       test_must_fail git rm -f baz &&
-       chmod 775 .
+       test_must_fail git rm -f baz
 '
 
 test_expect_success \
@@ -666,7 +666,7 @@ test_expect_success 'rm of a populated nested submodule with nested untracked fi
        test_cmp expect actual
 '
 
-test_expect_success 'rm of a populated nested submodule with a nested .git directory fails even when forced' '
+test_expect_success "rm absorbs submodule's nested .git directory" '
        git reset --hard &&
        git submodule update --recursive &&
        (cd submod/subsubmod &&