"Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Han-Wen Nienhuys <hanwen@xxxxxxxxxx> > > Signed-off-by: Han-Wen Nienhuys <hanwen@xxxxxxxxxx> > --- > t/t7509-commit-authorship.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) This seems identical to one of the commits in hn/refs-test-cleanup that has already been merged to 'master', so I'll drop this copy. Thanks. > diff --git a/t/t7509-commit-authorship.sh b/t/t7509-commit-authorship.sh > index ee6c47416ed..d568593382c 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 <cherry@xxxxxxx>" && > 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 &&
