File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' '
147
147
test_tick &&
148
148
git commit -am "cherry-pick 1" --author="Cherry <[email protected] >" &&
149
149
git tag cherry-pick-head &&
150
- git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD &&
150
+ git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) &&
151
151
echo "This is a MERGE_MSG" >.git/MERGE_MSG &&
152
152
echo "cherry-pick 1b" >>foo &&
153
153
test_tick &&
@@ -162,7 +162,7 @@ test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' '
162
162
'
163
163
164
164
test_expect_success ' --reset-author with CHERRY_PICK_HEAD' '
165
- git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD &&
165
+ git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) &&
166
166
echo "cherry-pick 2" >>foo &&
167
167
test_tick &&
168
168
git commit -am "cherry-pick 2" --reset-author &&
You can’t perform that action at this time.
0 commit comments