Skip to content

Commit d9929cb

Browse files
committed
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
2 parents 53cb210 + 53753a3 commit d9929cb

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

t/t9001-send-email.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,15 +539,14 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" '
539539
test_path_is_file my-hooks.ran &&
540540
cat >expect <<-EOF &&
541541
fatal: longline.patch: rejected by sendemail-validate hook
542-
fatal: command '"'"'$(pwd)/my-hooks/sendemail-validate'"'"' died with exit code 1
542+
fatal: command '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1
543543
warning: no patches were sent
544544
EOF
545545
test_cmp expect actual
546546
'
547547

548548
test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
549-
hooks_path="$(pwd)/my-hooks" &&
550-
test_config core.hooksPath "$hooks_path" &&
549+
test_config core.hooksPath "$(pwd)/my-hooks" &&
551550
test_when_finished "rm my-hooks.ran" &&
552551
test_must_fail git send-email \
553552
--from="Example <[email protected]>" \
@@ -558,7 +557,7 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
558557
test_path_is_file my-hooks.ran &&
559558
cat >expect <<-EOF &&
560559
fatal: longline.patch: rejected by sendemail-validate hook
561-
fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1
560+
fatal: command '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1
562561
warning: no patches were sent
563562
EOF
564563
test_cmp expect actual

0 commit comments

Comments
 (0)