diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-25 16:21:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-25 16:21:19 +0900 |
| commit | d9929cbb08af52da43711b3bf4938bf9e489ebc8 (patch) | |
| tree | 1b13fbc56dd01a6c59867580173a758b31d280fb | |
| parent | Merge branch 'ab/send-email-validate-errors-fix' (diff) | |
| parent | t9001-send-email.sh: fix expected absolute paths on Windows (diff) | |
| download | tgif-d9929cbb08af52da43711b3bf4938bf9e489ebc8.tar.xz | |
Merge branch 'jt/send-email-validate-errors-fix'
Fix a test breakage.
* jt/send-email-validate-errors-fix:
t9001-send-email.sh: fix expected absolute paths on Windows
| -rwxr-xr-x | t/t9001-send-email.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 2acf389837..aa603cf4d0 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -539,15 +539,14 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" ' test_path_is_file my-hooks.ran && cat >expect <<-EOF && fatal: longline.patch: rejected by sendemail-validate hook - fatal: command '"'"'$(pwd)/my-hooks/sendemail-validate'"'"' died with exit code 1 + fatal: command '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1 warning: no patches were sent EOF test_cmp expect actual ' test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" ' - hooks_path="$(pwd)/my-hooks" && - test_config core.hooksPath "$hooks_path" && + test_config core.hooksPath "$(pwd)/my-hooks" && test_when_finished "rm my-hooks.ran" && test_must_fail git send-email \ --from="Example <nobody@example.com>" \ @@ -558,7 +557,7 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" ' test_path_is_file my-hooks.ran && cat >expect <<-EOF && fatal: longline.patch: rejected by sendemail-validate hook - fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1 + fatal: command '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1 warning: no patches were sent EOF test_cmp expect actual |