mirror of
https://github.com/git/git.git
synced 2024-06-09 21:06:11 +02:00
send-email: use 'git hook run' for 'sendemail-validate'
Change the "sendmail-validate" hook to be run via the "git hook run" wrapper instead of via a direct invocation. This is the smallest possibly change to get "send-email" using "git hook run". We still check the hook itself with "-x", and set a "GIT_DIR" variable, both of which are asserted by our tests. We'll need to get rid of this special behavior if we start running N hooks, but for now let's be as close to bug-for-bug compatible as possible. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0d3979c175
commit
a755530454
|
@ -225,13 +225,13 @@ sub format_2822_time {
|
||||||
my $editor;
|
my $editor;
|
||||||
|
|
||||||
sub system_or_msg {
|
sub system_or_msg {
|
||||||
my ($args, $msg) = @_;
|
my ($args, $msg, $cmd_name) = @_;
|
||||||
system(@$args);
|
system(@$args);
|
||||||
my $signalled = $? & 127;
|
my $signalled = $? & 127;
|
||||||
my $exit_code = $? >> 8;
|
my $exit_code = $? >> 8;
|
||||||
return unless $signalled or $exit_code;
|
return unless $signalled or $exit_code;
|
||||||
|
|
||||||
my @sprintf_args = ($args->[0], $exit_code);
|
my @sprintf_args = ($cmd_name ? $cmd_name : $args->[0], $exit_code);
|
||||||
if (defined $msg) {
|
if (defined $msg) {
|
||||||
# Quiet the 'redundant' warning category, except we
|
# Quiet the 'redundant' warning category, except we
|
||||||
# need to support down to Perl 5.8, so we can't do a
|
# need to support down to Perl 5.8, so we can't do a
|
||||||
|
@ -2075,10 +2075,10 @@ sub validate_patch {
|
||||||
my ($fn, $xfer_encoding) = @_;
|
my ($fn, $xfer_encoding) = @_;
|
||||||
|
|
||||||
if ($repo) {
|
if ($repo) {
|
||||||
|
my $hook_name = 'sendemail-validate';
|
||||||
my $hooks_path = $repo->command_oneline('rev-parse', '--git-path', 'hooks');
|
my $hooks_path = $repo->command_oneline('rev-parse', '--git-path', 'hooks');
|
||||||
require File::Spec;
|
require File::Spec;
|
||||||
my $validate_hook = File::Spec->catfile($hooks_path,
|
my $validate_hook = File::Spec->catfile($hooks_path, $hook_name);
|
||||||
'sendemail-validate');
|
|
||||||
my $hook_error;
|
my $hook_error;
|
||||||
if (-x $validate_hook) {
|
if (-x $validate_hook) {
|
||||||
require Cwd;
|
require Cwd;
|
||||||
|
@ -2088,13 +2088,19 @@ sub validate_patch {
|
||||||
chdir($repo->wc_path() or $repo->repo_path())
|
chdir($repo->wc_path() or $repo->repo_path())
|
||||||
or die("chdir: $!");
|
or die("chdir: $!");
|
||||||
local $ENV{"GIT_DIR"} = $repo->repo_path();
|
local $ENV{"GIT_DIR"} = $repo->repo_path();
|
||||||
$hook_error = system_or_msg([$validate_hook, $target]);
|
my @cmd = ("git", "hook", "run", "--ignore-missing",
|
||||||
|
$hook_name, "--");
|
||||||
|
my @cmd_msg = (@cmd, "<patch>");
|
||||||
|
my @cmd_run = (@cmd, $target);
|
||||||
|
$hook_error = system_or_msg(\@cmd_run, undef, "@cmd_msg");
|
||||||
chdir($cwd_save) or die("chdir: $!");
|
chdir($cwd_save) or die("chdir: $!");
|
||||||
}
|
}
|
||||||
if ($hook_error) {
|
if ($hook_error) {
|
||||||
die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" .
|
$hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" .
|
||||||
"%s\n" .
|
$hook_error . "\n" .
|
||||||
"warning: no patches were sent\n"), $fn, $hook_error);
|
"warning: no patches were sent\n"),
|
||||||
|
$fn, $hook_name);
|
||||||
|
die $hook_error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -539,7 +539,7 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" '
|
||||||
test_path_is_file my-hooks.ran &&
|
test_path_is_file my-hooks.ran &&
|
||||||
cat >expect <<-EOF &&
|
cat >expect <<-EOF &&
|
||||||
fatal: longline.patch: rejected by sendemail-validate hook
|
fatal: longline.patch: rejected by sendemail-validate hook
|
||||||
fatal: command '"'"'my-hooks/sendemail-validate'"'"' died with exit code 1
|
fatal: command '"'"'git hook run --ignore-missing sendemail-validate -- <patch>'"'"' died with exit code 1
|
||||||
warning: no patches were sent
|
warning: no patches were sent
|
||||||
EOF
|
EOF
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
|
@ -558,7 +558,7 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
|
||||||
test_path_is_file my-hooks.ran &&
|
test_path_is_file my-hooks.ran &&
|
||||||
cat >expect <<-EOF &&
|
cat >expect <<-EOF &&
|
||||||
fatal: longline.patch: rejected by sendemail-validate hook
|
fatal: longline.patch: rejected by sendemail-validate hook
|
||||||
fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1
|
fatal: command '"'"'git hook run --ignore-missing sendemail-validate -- <patch>'"'"' died with exit code 1
|
||||||
warning: no patches were sent
|
warning: no patches were sent
|
||||||
EOF
|
EOF
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
|
|
Loading…
Reference in New Issue