From: Han-Wen Nienhuys Date: Tue, 6 Jul 2021 18:47:57 +0000 (+0000) Subject: t7509: avoid direct file access for writing CHERRY_PICK_HEAD X-Git-Tag: v2.33.0-rc0~40^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52a47aea70875cb64a5a975189d6b5ba35b81574;p=thirdparty%2Fgit.git t7509: avoid direct file access for writing CHERRY_PICK_HEAD Signed-off-by: Han-Wen Nienhuys Signed-off-by: Junio C Hamano --- diff --git a/t/t7509-commit-authorship.sh b/t/t7509-commit-authorship.sh index ee6c47416e..d568593382 100755 --- a/t/t7509-commit-authorship.sh +++ b/t/t7509-commit-authorship.sh @@ -147,7 +147,7 @@ test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' ' test_tick && git commit -am "cherry-pick 1" --author="Cherry " && git tag cherry-pick-head && - git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD && + git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) && echo "This is a MERGE_MSG" >.git/MERGE_MSG && echo "cherry-pick 1b" >>foo && test_tick && @@ -162,7 +162,7 @@ test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' ' ' test_expect_success '--reset-author with CHERRY_PICK_HEAD' ' - git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD && + git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) && echo "cherry-pick 2" >>foo && test_tick && git commit -am "cherry-pick 2" --reset-author &&