git-send-email: improve --validate error output
Improve the output we emit on --validate error to:
* Say "FILE:LINE" instead of "FILE: LINE", to match "grep -n",
compiler error messages etc.
* Don't say "patch contains a" after just mentioning the filename,
just leave it at "FILE:LINE: is longer than[...]. The "contains a"
sounded like we were talking about the file in general, when we're
actually checking it line-by-line.
* Don't just say "rejected by sendemail-validate hook", but combine
that with the system_or_msg() output to say what exit code the hook
died with.
I had an aborted attempt to make the line length checker note all
lines that were longer than the limit. I didn't think that was worth
the effort, but I've left in the testing change to check that we die
as soon as we spot the first long line.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/git-send-email.perl b/git-send-email.perl
index 2dd4862..175da07 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -219,8 +219,8 @@
my $exit_code = $? >> 8;
return unless $signalled or $exit_code;
- return sprintf(__("failed to run command %s, died with code %d"),
- "@$args", $exit_code);
+ return sprintf(__("fatal: command '%s' died with exit code %d"),
+ $args->[0], $exit_code);
}
sub system_or_die {
@@ -1964,7 +1964,8 @@
}
if ($hook_error) {
die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" .
- "warning: no patches were sent\n"), $fn);
+ "%s\n" .
+ "warning: no patches were sent\n"), $fn, $hook_error);
}
}
@@ -1975,9 +1976,8 @@
or die sprintf(__("unable to open %s: %s\n"), $fn, $!);
while (my $line = <$fh>) {
if (length($line) > 998) {
- die sprintf(__("fatal: %s: %d: patch contains a line longer than 998 characters\n" .
- "warning: no patches were sent\n"),
- $fn, $.);
+ die sprintf(__("fatal: %s:%d is longer than 998 characters\n" .
+ "warning: no patches were sent\n"), $fn, $.);
}
}
}
