@@ -292,9 +292,10 @@ test_expect_success 'post-rewrite hook and fixups work for merges' '
git commit --fixup HEAD same2.t &&
fixup="$(git rev-parse HEAD)" &&
- mkdir -p .git/hooks &&
test_when_finished "rm .git/hooks/post-rewrite" &&
- echo "cat >actual" | write_script .git/hooks/post-rewrite &&
+ write_hook post-rewrite <<-\EOF &&
+ cat >actual
+ EOF
test_tick &&
git rebase -i --autosquash -r HEAD^^^ &&
@@ -36,7 +36,7 @@ test_expect_success 'setup remote repository' '
git clone --bare test_repo test_repo.git &&
cd test_repo.git &&
git --bare update-server-info &&
- write_script "hooks/post-update" <<-\EOF &&
+ write_hook post-update <<-\EOF &&
exec git update-server-info
EOF
ORIG_HEAD=$(git rev-parse --verify HEAD) &&
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t3430-rebase-merges.sh | 5 +++-- t/t5540-http-push-webdav.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)