[PATCH] gitweb: suppress 'Use of uninitialized value' error
- From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
- Date
- Jul 30, 2009, 21:15 UTC
- Message-ID
- <1248988540-8971-1-git-send-email-giuseppe.bilotta@gmail.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> --- gitweb/gitweb.perl | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
The patch could have been a one-liner by adding the defined check at line 943, but that pushed the line to 120 char, so I decided for this slightly more complex form.
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 7fbd5ff..c7f257e 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -940,10 +940,13 @@ sub href { if (defined $params{'hash_parent_base'}) { $href .= esc_url($params{'hash_parent_base'}); # skip the file_parent if it's the same as the file_name - delete $params{'file_parent'} if $params{'file_parent'} eq $params{'file_name'}; - if (defined $params{'file_parent'} && $params{'file_parent'} !~ /\.\./) { - $href .= ":/".esc_url($params{'file_parent'}); - delete $params{'file_parent'}; + if (defined $params{'file_parent'}) { + if ($params{'file_parent'} eq $params{'file_name'}) { + delete $params{'file_parent'}; + } else if ($params{'file_parent'} !~ /\.\./) { + $href .= ":/".esc_url($params{'file_parent'}); + delete $params{'file_parent'}; + } } $href .= ".."; delete $params{'hash_parent'};
-- 1.6.3.rc1.192.gdbfcb