From: Han-Wen Nienhuys Date: Mon, 2 Aug 2021 16:53:34 +0000 (+0000) Subject: t7064: use update-ref -d to remove upstream branch X-Git-Tag: v2.34.0-rc0~242^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cf9f0fca1ad0fedb88f63f59b311b4d80b28f0e;p=thirdparty%2Fgit.git t7064: use update-ref -d to remove upstream branch The previous code tested this by writing $ZERO_OID explicitly in the packed-refs file. This is a type of corruption that doesn't reflect realistic use-cases. In addition, even the ref-store test-tool refuses to write invalid OIDs. (update-ref interprets $ZERO_OID is deleting the ref). Signed-off-by: Han-Wen Nienhuys Signed-off-by: Junio C Hamano --- diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh index 4613882caf..eeb0534163 100755 --- a/t/t7064-wtstatus-pv2.sh +++ b/t/t7064-wtstatus-pv2.sh @@ -373,10 +373,7 @@ test_expect_success 'verify upstream fields in branch header' ' ## Test upstream-gone case. Fake this by pointing ## origin/initial-branch at a non-existing commit. - OLD=$(git rev-parse origin/initial-branch) && - NEW=$ZERO_OID && - mv .git/packed-refs .git/old-packed-refs && - sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs && + git update-ref -d refs/remotes/origin/initial-branch && HUF=$(git rev-parse HEAD) &&