gitweb: fix uninitialized variable warning.

Perl spit out a varning when "blob" or "blob_plain" actions were
used without a $hash parameter.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 645ae795c753a64b08fdd92b1d6c1aab03cbae53..250138520fcc2c1116244379580c28bf9ba43bf3 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2547,11 +2547,7 @@ sub git_heads {
 }
 
 sub git_blob_plain {
 }
 
 sub git_blob_plain {

-       # blobs defined by non-textual hash id's can be cached

        my $expires;
        my $expires;

-       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
-               $expires = "+1d";
-       }

 
        if (!defined $hash) {
                if (defined $file_name) {
 
        if (!defined $hash) {
                if (defined $file_name) {


@@ -2561,7 +2557,11 @@ sub git_blob_plain {
                } else {
                        die_error(undef, "No file name defined");
                }
                } else {
                        die_error(undef, "No file name defined");
                }

+       } elsif ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               # blobs defined by non-textual hash id's can be cached
+               $expires = "+1d";

        }
        }

+

        my $type = shift;
        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or die_error(undef, "Couldn't cat $file_name, $hash");
        my $type = shift;
        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or die_error(undef, "Couldn't cat $file_name, $hash");


@@ -2589,11 +2589,7 @@ sub git_blob_plain {
 }
 
 sub git_blob {
 }
 
 sub git_blob {

-       # blobs defined by non-textual hash id's can be cached

        my $expires;
        my $expires;

-       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
-               $expires = "+1d";
-       }

 
        if (!defined $hash) {
                if (defined $file_name) {
 
        if (!defined $hash) {
                if (defined $file_name) {


@@ -2603,7 +2599,11 @@ sub git_blob {
                } else {
                        die_error(undef, "No file name defined");
                }
                } else {
                        die_error(undef, "No file name defined");
                }

+       } elsif ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               # blobs defined by non-textual hash id's can be cached
+               $expires = "+1d";

        }
        }

+

        my ($have_blame) = gitweb_check_feature('blame');
        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or die_error(undef, "Couldn't cat $file_name, $hash");
        my ($have_blame) = gitweb_check_feature('blame');
        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or die_error(undef, "Couldn't cat $file_name, $hash");