diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-21 17:20:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 17:20:11 -0800 |
| commit | a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc (patch) | |
| tree | 11a25853c8469f614c21423e9e1c8fc0b05a7284 /gitweb | |
| parent | 5673d695fcce217b26d1a5956c1184ff62dc74f1 (diff) | |
| parent | d5a719e4afbfd74cf5ccf94c2a5b27aa5d06e914 (diff) | |
| download | git-a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc.tar.gz git-a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc.tar.xz | |
Merge branch 'maint'
* maint:
t/t7500-commit.sh: use test_cmp instead of test
t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate
gitweb/gitweb.perl: don't call S_ISREG() with undef
gitweb/gitweb.perl: remove use of qw(...) as parentheses
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 0779f12d6..1b9369d1a 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3501,7 +3501,7 @@ sub print_feed_meta { $href_params{'-title'} = 'log'; } - foreach my $format qw(RSS Atom) { + foreach my $format (qw(RSS Atom)) { my $type = lc($format); my %link_attr = ( '-rel' => 'alternate', @@ -3682,7 +3682,7 @@ sub git_footer_html { } $href_params{'-title'} ||= 'log'; - foreach my $format qw(RSS Atom) { + foreach my $format (qw(RSS Atom)) { $href_params{'action'} = lc($format); print $cgi->a({-href => href(%href_params), -title => "$href_params{'-title'} $format feed", @@ -4412,7 +4412,7 @@ sub git_difftree_body { } if ($diff->{'from_mode'} ne ('0' x 6)) { $from_mode_oct = oct $diff->{'from_mode'}; - if (S_ISREG($to_mode_oct)) { # only for regular file + if (S_ISREG($from_mode_oct)) { # only for regular file $from_mode_str = sprintf("%04o", $from_mode_oct & 0777); # permission bits } $from_file_type = file_type($diff->{'from_mode'}); |