@matheusbsbs / matheus-bagliano / commits / 2815326f09

send-email: don't needlessly abs_path() the core.hooksPath

In c8243933c74 (git-send-email: Respect core.hooksPath setting, 2021-03-23) we started supporting core.hooksPath in "send-email". It's been reported that on Windows[1] doing this by calling abs_path() results in different canonicalizations of the absolute path. This wasn't an issue in c8243933c74 itself, but was revealed by my ea7811b37e0 (git-send-email: improve --validate error output, 2021-04-06) when we started emitting the path to the hook, which was previously only internal to git-send-email.perl. The just-landed 53753a37d09 (t9001-send-email.sh: fix expected absolute paths on Windows, 2021-05-24) narrowly fixed this issue, but I believe we can do better here. We should not be relying on whatever changes Perl's abs_path() makes to the path "rev-parse --git-path hooks" hands to us. Let's instead trust it, and hand it to Perl's system() in git-send-email.perl. It will handle either a relative or absolute path. So let's revert most of 53753a37d09 and just have "hooks_path" return what we get from "rev-parse" directly without modification. This has the added benefit of making the error message friendlier in the common case, we'll no longer print an absolute path for repository-local hook errors. 1. http://lore.kernel.org/git/bb30fe2b-cd75-4782-24a6-08bb002a0367@kdbg.org Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed May 26, 2021 at 13:21 UTC 2815326f095a1126fe9b099c311fdde8d7b7b591

2 files changed +5 -5

perl/Git.pm

+1 -2

@@ -629,8 +629,7 @@ sub hooks_path {

629 my ($self) = @_;

630

631 my $dir = $self->command_oneline('rev-parse', '--git-path', 'hooks');

632 - my $abs = abs_path($dir);

633 - return $abs;

632 + return $dir;

633 }

634

635 =item wc_path ()

t/t9001-send-email.sh

+4 -3

@@ -539,14 +539,15 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" '

539 test_path_is_file my-hooks.ran &&

540 cat >expect <<-EOF &&

541 fatal: longline.patch: rejected by sendemail-validate hook

542 - fatal: command '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1

542 + fatal: command '"'"'my-hooks/sendemail-validate'"'"' died with exit code 1

543 warning: no patches were sent

544 EOF

545 test_cmp expect actual

546 '

547

548 test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '

549 - test_config core.hooksPath "$(pwd)/my-hooks" &&

549 + hooks_path="$(pwd)/my-hooks" &&

550 + test_config core.hooksPath "$hooks_path" &&

551 test_when_finished "rm my-hooks.ran" &&

552 test_must_fail git send-email \

553 --from="Example <nobody@example.com>" \

@@ -557,7 +558,7 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '

558 test_path_is_file my-hooks.ran &&

559 cat >expect <<-EOF &&

560 fatal: longline.patch: rejected by sendemail-validate hook

560 - fatal: command '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1

561 + fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1

562 warning: no patches were sent

563 EOF

564 test_cmp expect actual