mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
t7509: avoid direct file access for writing CHERRY_PICK_HEAD
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ae815940f6
commit
52a47aea70
1 changed files with 2 additions and 2 deletions
|
@ -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 <cherry@pick.er>" &&
|
||||
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 &&
|
||||
|
|
Loading…
Reference in a new issue