From: Robert Foss <robert.foss@linaro.org>
To: "Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Drew DeVault" <sir@cmpwn.com>,
"Rafael Aquini" <aquini@redhat.com>,
"Marcelo Arenas Belón" <carenas@gmail.com>,
"Robert Foss" <robert.foss@linaro.org>
Subject: [PATCH v2] git-send-email: Respect core.hooksPath setting
Date: Tue, 23 Mar 2021 17:27:18 +0100 [thread overview]
Message-ID: <20210323162718.1143982-1-robert.foss@linaro.org> (raw)
get-send-email currently makes the assumption that the
'sendemail-validate' hook exists inside of the repository.
Since the introduction of 'core.hooksPath' configuration option in
v2.9, this is no longer true.
Instead of assuming a hardcoded repo relative path, query
git for the actual path of the hooks directory.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
---
Changes since v1:
- Ævar: Add unit test
- Ævar: Add support for getting the hooks_path() from Git perl module
- Ævar: Use new hooks_path() instread of issuing git rev-parse in
git-send-email.perl
Note: The test currently leaves a file in a mktemp directory
in /tmp.
git-send-email.perl | 4 ++--
perl/Git.pm | 9 +++++++++
t/t9001-send-email.sh | 16 ++++++++++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 1f425c0809..c3dd825322 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1942,8 +1942,8 @@ sub validate_patch {
my ($fn, $xfer_encoding) = @_;
if ($repo) {
- my $validate_hook = catfile(catdir($repo->repo_path(), 'hooks'),
- 'sendemail-validate');
+ my $hook_path = $repo->hooks_path();
+ my $validate_hook = catfile($hook_path, 'sendemail-validate');
my $hook_error;
if (-x $validate_hook) {
my $target = abs_path($fn);
diff --git a/perl/Git.pm b/perl/Git.pm
index 02eacef0c2..ac1fabff28 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -226,6 +226,8 @@ sub repository {
$opts{Repository} = abs_path($dir);
}
+ $opts{HooksPath} = $search->command_oneline('rev-parse', '--git-path', 'hooks');
+
delete $opts{Directory};
}
@@ -619,6 +621,13 @@ sub _prompt {
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 { $_[0]->{opts}->{HooksPath} }
=item wc_path ()
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 4eee9c3dcb..73b3bc1ce6 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -513,6 +513,22 @@ do
done
+test_expect_success $PREREQ "--validate respects core.hooksPath setting" '
+ clean_fake_sendmail &&
+ tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX) &&
+ printf "#!/bin/sh" >> $tmp_dir/sendemail-validate &&
+ printf "return 1" >> $tmp_dir/sendemail-validate &&
+ chmod a+x $tmp_dir/sendemail-validate &&
+ git -c core.hooksPath=$tmp_dir send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ --validate \
+ longline.patch \
+ 2>&1 >/dev/null | \
+ grep "rejected by sendemail-validate"
+'
+
for enc in 7bit 8bit quoted-printable base64
do
test_expect_success $PREREQ "--transfer-encoding=$enc produces correct header" '
--
2.31.0.30.g398dba342d.dirty
next reply other threads:[~2021-03-23 16:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 16:27 Robert Foss [this message]
2021-03-23 17:33 ` [PATCH v3] git-send-email: Respect core.hooksPath setting Ævar Arnfjörð Bjarmason
2021-03-23 22:40 ` Junio C Hamano
2021-03-24 0:44 ` Ævar Arnfjörð Bjarmason
2021-03-24 1:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210323162718.1143982-1-robert.foss@linaro.org \
--to=robert.foss@linaro.org \
--cc=aquini@redhat.com \
--cc=avarab@gmail.com \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sir@cmpwn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).