Re: [PATCH 2/9] gitweb: change die_error to take "extra" argument for extended die information
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Jan 15, 2010, 22:40 UTC
- Message-ID
- <m3y6jzc7re.fsf@localhost.localdomain>
- In-Reply-To
- <1263432185-21334-3-git-send-email-warthog9@eaglescrag.net>
"John 'Warthog9' Hawley" <warthog9@eaglescrag.net> writes:
Don't you want kernel.org address also for authorship? Also commit summary can be written in shorter way, see proposal below.
From: "John 'Warthog9' Hawley" <warthog9@kernel.org> Subject: gitweb: Allow for longer error explanation in die_error()
> This is a small change that just adds a 3rd, optional, parameter to die_error > that allows for extended error information to be output along with what the > error was.
Singed-off-by: "John 'Warthog9' Hawley" <warthog9@kernel.org>
Show 25 quoted lines
> ---
> gitweb/gitweb.perl | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 0a07d3a..8298de5 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -3391,6 +3391,7 @@ sub git_footer_html {
> sub die_error {
> my $status = shift || 500;
> my $error = shift || "Internal server error";
> + my $extra = shift;
>
> my %http_responses = (
> 400 => '400 Bad Request',
> @@ -3405,8 +3406,13 @@ sub die_error {
> <br /><br />
> $status - $error
> <br />
> -</div>
> EOF
> + if (defined $extra) {
> + print "<hr />\n" .
> + "$extra\n";Following gitweb whitespace convention (tab for indent, space for align), it should be:
+ print "<hr />\n" . + "$extra\n";
(6 x space in place of last tab).
Show 9 quoted lines
> + } > + print "</div>\n"; > + > git_footer_html(); > exit; > } > -- > 1.6.5.2 >
-- Jakub Narebski Poland ShadeHawk on #git