diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2017-06-01 16:50:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-02 10:58:25 +0900 |
| commit | 177409e5897988f03e0c8111c94db6ea0466b138 (patch) | |
| tree | 3065e4a03620792a5796e4ea27b1ea34f6d4e699 | |
| parent | 6489660b4bba7456fac0d0a41f5d6295c5900c5f (diff) | |
| download | git-177409e5897988f03e0c8111c94db6ea0466b138.tar.gz | |
send-email: check for repo before invoking hookjt/send-email-validate-hook
Unless --no-validate is passed, send-email will invoke
$repo->repo_path() in its search for a validate hook regardless of
whether a Git repo is actually present. Teach send-email to first check
for repo existence.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-send-email.perl | 32 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 8 |
2 files changed, 25 insertions, 15 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index c314cc2b51..fa559cca3f 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1739,21 +1739,23 @@ sub unique_email_list { sub validate_patch { my $fn = shift; - my $validate_hook = catfile(catdir($repo->repo_path(), 'hooks'), - 'sendemail-validate'); - my $hook_error; - if (-x $validate_hook) { - my $target = abs_path($fn); - # The hook needs a correct cwd and GIT_DIR. - my $cwd_save = cwd(); - chdir($repo->wc_path() or $repo->repo_path()) - or die("chdir: $!"); - local $ENV{"GIT_DIR"} = $repo->repo_path(); - $hook_error = "rejected by sendemail-validate hook" - if system($validate_hook, $target); - chdir($cwd_save) or die("chdir: $!"); - } - return $hook_error if $hook_error; + if ($repo) { + my $validate_hook = catfile(catdir($repo->repo_path(), 'hooks'), + 'sendemail-validate'); + my $hook_error; + if (-x $validate_hook) { + my $target = abs_path($fn); + # The hook needs a correct cwd and GIT_DIR. + my $cwd_save = cwd(); + chdir($repo->wc_path() or $repo->repo_path()) + or die("chdir: $!"); + local $ENV{"GIT_DIR"} = $repo->repo_path(); + $hook_error = "rejected by sendemail-validate hook" + if system($validate_hook, $target); + chdir($cwd_save) or die("chdir: $!"); + } + return $hook_error if $hook_error; + } open(my $fh, '<', $fn) or die sprintf(__("unable to open %s: %s\n"), $fn, $!); diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 15128c755a..d1e4e8ad19 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1953,4 +1953,12 @@ test_expect_success $PREREQ 'invoke hook' ' ) ' +test_expect_success $PREREQ 'test that send-email works outside a repo' ' + nongit git send-email \ + --from="Example <nobody@example.com>" \ + --to=nobody@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + "$(pwd)/0001-add-master.patch" +' + test_done |