pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 879d0c169d6ca2f608c75fd10b5414c9abb3005c..44bf1d84af574509c5a8f6f05721d7c4f9719439 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -106,7 +106,7 @@ test_expect_success 'git diff-index --cached -M shows 2 added + 1 unmerged' '
        A       THREE
        A       TWO
        EOF
-       git diff-index --cached --name-status HEAD >actual &&
+       git diff-index --cached -M --name-status HEAD >actual &&
        test_cmp expected actual
 '
 
@@ -213,7 +213,7 @@ EOF
        git checkout master
 '
 
-test_expect_failure 'status --branch with detached HEAD' '
+test_expect_success 'status --branch with detached HEAD' '
        git reset --hard &&
        git checkout master^0 &&
        git status --branch --porcelain >actual &&