fix 2 more test files that were accessing file system directly.
PATCH 1/2 t1415: avoid direct filesystem access for writing refs
In reply to Han-Wen Nienhuys via GitGitGadgetFrom: Han-Wen Nienhuys <[email protected]>
--- t/t1415-worktree-refs.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
t/t1415-worktree-refs.sh +4 -6
@@ -37,9 +37,8 @@ test_expect_success 'resolve main-worktree/HEAD' ' ' test_expect_success 'ambiguous main-worktree/HEAD' ' - mkdir -p .git/refs/heads/main-worktree && - test_when_finished rm -f .git/refs/heads/main-worktree/HEAD && - cp .git/HEAD .git/refs/heads/main-worktree/HEAD && + test_when_finished git update-ref -d refs/heads/main-worktree/HEAD && + git update-ref refs/heads/main-worktree/HEAD $(git rev-parse HEAD) && git rev-parse main-worktree/HEAD 2>warn && grep "main-worktree/HEAD.*ambiguous" warn '
@@ -51,9 +50,8 @@ test_expect_success 'resolve worktrees/xx/HEAD' ' ' test_expect_success 'ambiguous worktrees/xx/HEAD' ' - mkdir -p .git/refs/heads/worktrees/wt1 && - test_when_finished rm -f .git/refs/heads/worktrees/wt1/HEAD && - cp .git/HEAD .git/refs/heads/worktrees/wt1/HEAD && + git update-ref refs/heads/worktrees/wt1/HEAD $(git rev-parse HEAD) && + test_when_finished git update-ref -d refs/heads/worktrees/wt1/HEAD && git rev-parse worktrees/wt1/HEAD 2>warn && grep "worktrees/wt1/HEAD.*ambiguous" warn '
Signature · 1 line
gitgitgadget
cover fix 2 more test files that were accessing file system directly.
This reduced the number of test failures in the reftable series by a bit.
Han-Wen Nienhuys (2):
t1415: avoid direct filesystem access for writing refs
t7509: avoid direct file access for writing CHERRY_PICK_HEAD
t/t1415-worktree-refs.sh | 10 ++++------ t/t7509-commit-authorship.sh | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-)
base-commit: 670b81a890388c60b7032a4f5b879f2ece8c4558
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1042%2Fhanwen%2Freftable-tests2-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1042/hanwen/reftable-tests2-v1
Pull-Request: https://github.com/git/git/pull/1042
Signature · 1 line
gitgitgadget
PATCH 2/2 t7509: avoid direct file access for writing CHERRY_PICK_HEAD
From: Han-Wen Nienhuys <[email protected]>
--- t/t7509-commit-authorship.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
t/t7509-commit-authorship.sh +2 -2
@@ -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 <[email protected]>" && 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 &&
Signature · 1 line
gitgitgadget
Quoted 5 lines · Han-Wen Nienhuys via GitGitGadget
This reduced the number of test failures in the reftable series by a bit.
Han-Wen Nienhuys (2):
t1415: avoid direct filesystem access for writing refs
t7509: avoid direct file access for writingCHERRY_PICK_HEAD
Thanks. Both look quite sensible.
Will queue.
Quoted 10 lines
t/t1415-worktree-refs.sh | 10 ++++------ t/t7509-commit-authorship.sh | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-)base-commit:
670b81a890388c60b7032a4f5b879f2ece8c4558
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1042%2Fhanwen%2Freftable-tests2-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1042/hanwen/reftable-tests2-v1
Pull-Request: https://github.com/git/git/pull/1042