mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
Merge branch 'ab/send-email-validate-errors'
Clean-up codepaths that implements "git send-email --validate" option and improves the message from it. * ab/send-email-validate-errors: git-send-email: improve --validate error output git-send-email: refactor duplicate $? checks into a function git-send-email: test full --validate output
This commit is contained in:
commit
2279289e95
2 changed files with 55 additions and 25 deletions
|
@ -212,22 +212,31 @@ sub format_2822_time {
|
|||
my $multiedit;
|
||||
my $editor;
|
||||
|
||||
sub system_or_msg {
|
||||
my ($args, $msg) = @_;
|
||||
system(@$args);
|
||||
my $signalled = $? & 127;
|
||||
my $exit_code = $? >> 8;
|
||||
return unless $signalled or $exit_code;
|
||||
|
||||
return sprintf(__("fatal: command '%s' died with exit code %d"),
|
||||
$args->[0], $exit_code);
|
||||
}
|
||||
|
||||
sub system_or_die {
|
||||
my $msg = system_or_msg(@_);
|
||||
die $msg if $msg;
|
||||
}
|
||||
|
||||
sub do_edit {
|
||||
if (!defined($editor)) {
|
||||
$editor = Git::command_oneline('var', 'GIT_EDITOR');
|
||||
}
|
||||
my $die_msg = __("the editor exited uncleanly, aborting everything");
|
||||
if (defined($multiedit) && !$multiedit) {
|
||||
for (@_) {
|
||||
system('sh', '-c', $editor.' "$@"', $editor, $_);
|
||||
if (($? & 127) || ($? >> 8)) {
|
||||
die(__("the editor exited uncleanly, aborting everything"));
|
||||
}
|
||||
}
|
||||
system_or_die(['sh', '-c', $editor.' "$@"', $editor, $_], $die_msg) for @_;
|
||||
} else {
|
||||
system('sh', '-c', $editor.' "$@"', $editor, @_);
|
||||
if (($? & 127) || ($? >> 8)) {
|
||||
die(__("the editor exited uncleanly, aborting everything"));
|
||||
}
|
||||
system_or_die(['sh', '-c', $editor.' "$@"', $editor, @_], $die_msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -698,9 +707,7 @@ sub is_format_patch_arg {
|
|||
if ($validate) {
|
||||
foreach my $f (@files) {
|
||||
unless (-p $f) {
|
||||
my $error = validate_patch($f, $target_xfer_encoding);
|
||||
$error and die sprintf(__("fatal: %s: %s\nwarning: no patches were sent\n"),
|
||||
$f, $error);
|
||||
validate_patch($f, $target_xfer_encoding);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1952,11 +1959,14 @@ sub validate_patch {
|
|||
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);
|
||||
$hook_error = system_or_msg([$validate_hook, $target]);
|
||||
chdir($cwd_save) or die("chdir: $!");
|
||||
}
|
||||
return $hook_error if $hook_error;
|
||||
if ($hook_error) {
|
||||
die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" .
|
||||
"%s\n" .
|
||||
"warning: no patches were sent\n"), $fn, $hook_error);
|
||||
}
|
||||
}
|
||||
|
||||
# Any long lines will be automatically fixed if we use a suitable transfer
|
||||
|
@ -1966,7 +1976,8 @@ sub validate_patch {
|
|||
or die sprintf(__("unable to open %s: %s\n"), $fn, $!);
|
||||
while (my $line = <$fh>) {
|
||||
if (length($line) > 998) {
|
||||
return sprintf(__("%s: patch contains a line longer than 998 characters"), $.);
|
||||
die sprintf(__("fatal: %s:%d is longer than 998 characters\n" .
|
||||
"warning: no patches were sent\n"), $fn, $.);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -415,15 +415,23 @@ test_expect_success $PREREQ 'reject long lines' '
|
|||
z512=$z64$z64$z64$z64$z64$z64$z64$z64 &&
|
||||
clean_fake_sendmail &&
|
||||
cp $patches longline.patch &&
|
||||
echo $z512$z512 >>longline.patch &&
|
||||
cat >>longline.patch <<-EOF &&
|
||||
$z512$z512
|
||||
not a long line
|
||||
$z512$z512
|
||||
EOF
|
||||
test_must_fail git send-email \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
--transfer-encoding=8bit \
|
||||
$patches longline.patch \
|
||||
2>errors &&
|
||||
grep longline.patch errors
|
||||
2>actual &&
|
||||
cat >expect <<-\EOF &&
|
||||
fatal: longline.patch:35 is longer than 998 characters
|
||||
warning: no patches were sent
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ 'no patch was sent' '
|
||||
|
@ -527,22 +535,33 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" '
|
|||
--to=nobody@example.com \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
--validate \
|
||||
longline.patch 2>err &&
|
||||
longline.patch 2>actual &&
|
||||
test_path_is_file my-hooks.ran &&
|
||||
grep "rejected by sendemail-validate" err
|
||||
cat >expect <<-EOF &&
|
||||
fatal: longline.patch: rejected by sendemail-validate hook
|
||||
fatal: command '"'"'$(pwd)/my-hooks/sendemail-validate'"'"' died with exit code 1
|
||||
warning: no patches were sent
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
|
||||
test_config core.hooksPath "$(pwd)/my-hooks" &&
|
||||
hooks_path="$(pwd)/my-hooks" &&
|
||||
test_config core.hooksPath "$hooks_path" &&
|
||||
test_when_finished "rm my-hooks.ran" &&
|
||||
test_must_fail git send-email \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
--validate \
|
||||
longline.patch 2>err &&
|
||||
longline.patch 2>actual &&
|
||||
test_path_is_file my-hooks.ran &&
|
||||
grep "rejected by sendemail-validate" err
|
||||
cat >expect <<-EOF &&
|
||||
fatal: longline.patch: rejected by sendemail-validate hook
|
||||
fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1
|
||||
warning: no patches were sent
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
for enc in 7bit 8bit quoted-printable base64
|
||||
|
|
Loading…
Reference in a new issue