Browse Source

send-email: move "hooks_path" invocation to git-send-email.perl

Move the newly added "hooks_path" API in Git.pm to its only user in
git-send-email.perl. This was added in c8243933c7 (git-send-email:
Respect core.hooksPath setting, 2021-03-23), meaning that it hasn't
yet made it into a non-rc release of git.

The consensus with Git.pm is that we need to be considerate of
out-of-tree users who treat it as a public documented interface. We
should therefore be less willing to add new functionality to it, least
we be stuck supporting it after our own uses for it disappear.

In this case the git-send-email.perl hook invocation will probably be
replaced by a future "git hook run" command, and in the commit
preceding this one the "hooks_path" become nothing but a trivial
wrapper for "rev-parse --git-path hooks" anyway (with no
Cwd::abs_path() call), so let's just inline this command in
git-send-email.perl itself.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 4 years ago committed by Junio C Hamano
parent
commit
7cbc0455cc
  1. 3
      git-send-email.perl
  2. 12
      perl/Git.pm

3
git-send-email.perl

@ -1949,7 +1949,8 @@ sub validate_patch { @@ -1949,7 +1949,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) {

12
perl/Git.pm

@ -619,18 +619,6 @@ Return path to the git repository. Must be called on a repository instance. @@ -619,18 +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');
return $dir;
}

=item wc_path ()


Loading…
Cancel
Save