diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-27 06:36:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-27 06:36:57 +0300 |
| commit | f4d715b0acaf008d0f09c42378cac90acaadea8e (patch) | |
| tree | e87a3bdac9d479f29c36c5713697631dd530167d | |
| parent | 1accb34ce0055b9ab43cdf1a8ef6e22e7ae34ffc (diff) | |
| parent | 7cbc0455cc07702c5eeff1062c7e2a820758714f (diff) | |
Merge branch 'ab/send-email-inline-hooks-path'
Code simplification.
* ab/send-email-inline-hooks-path:
send-email: move "hooks_path" invocation to git-send-email.perl
send-email: don't needlessly abs_path() the core.hooksPath
| -rwxr-xr-x | git-send-email.perl | 3 | ||||
| -rw-r--r-- | perl/Git.pm | 13 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 7 |
3 files changed, 6 insertions, 17 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 170f42fe21..25be2ebd2a 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1959,7 +1959,8 @@ sub validate_patch { my ($fn, $xfer_encoding) = @_; if ($repo) { - my $validate_hook = catfile($repo->hooks_path(), + my $hooks_path = $repo->command_oneline('rev-parse', '--git-path', 'hooks'); + my $validate_hook = catfile($hooks_path, 'sendemail-validate'); my $hook_error; if (-x $validate_hook) { diff --git a/perl/Git.pm b/perl/Git.pm index 73ebbf80cc..02eacef0c2 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -619,19 +619,6 @@ Return path to the git repository. Must be called on a repository instance. sub repo_path { $_[0]->{opts}->{Repository} } -=item hooks_path () - -Return path to the hooks directory. Must be called on a repository instance. - -=cut - -sub hooks_path { - my ($self) = @_; - - my $dir = $self->command_oneline('rev-parse', '--git-path', 'hooks'); - my $abs = abs_path($dir); - return $abs; -} =item wc_path () diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index aa603cf4d0..3b7540050c 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -539,14 +539,15 @@ 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 '"'"'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" ' - test_config core.hooksPath "$(pwd)/my-hooks" && + hooks_path="$(pwd)/my-hooks" && + test_config core.hooksPath "$hooks_path" && test_when_finished "rm my-hooks.ran" && test_must_fail git send-email \ --from="Example <nobody@example.com>" \ @@ -557,7 +558,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 '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1 + fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1 warning: no patches were sent EOF test_cmp expect actual |