mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 22:14:34 +01:00
Code

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

Browse Source 
Move the newly added "hooks_path" API in Git.pm to its only user in
git-send-email.perl. This was added in c8243933c74 (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>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-05-26 13:21:07 +02:00 committed by Junio C Hamano
parent 2815326f09
commit 7cbc0455cc
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-send-email.perl
View File

@ -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
View File

@ -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 ()