undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Fix git_blame

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Aneesh Kumar K.V 2006-09-01 09:13:32 +05:30 committed by Junio C Hamano
parent 95676853b2
commit 1d3fc68ae7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gitweb/gitweb.perl
View File

@ -2251,7 +2251,8 @@ sub git_blame2 {
my $fd; my $fd;
my $ftype; my $ftype;
if (!gitweb_check_feature('blame')) { my ($have_blame) = gitweb_check_feature('blame');
if (!$have_blame) {
die_error('403 Permission denied', "Permission denied"); die_error('403 Permission denied', "Permission denied");
} }
die_error('404 Not Found', "File name not defined") if (!$file_name); die_error('404 Not Found', "File name not defined") if (!$file_name);
@ -2320,7 +2321,8 @@ HTML
sub git_blame { sub git_blame {
my $fd; my $fd;
if (!gitweb_check_feature('blame')) { my ($have_blame) = gitweb_check_feature('blame');
if (!$have_blame) {
die_error('403 Permission denied', "Permission denied"); die_error('403 Permission denied', "Permission denied");
} }
die_error('404 Not Found', "File name not defined") if (!$file_name); die_error('404 Not Found', "File name not defined") if (!$file_name);
@ -2494,7 +2496,7 @@ sub git_blob {
die_error(undef, "No file name defined"); die_error(undef, "No file name defined");
} }
} }
my $have_blame = gitweb_check_feature('blame'); my ($have_blame) = gitweb_check_feature('blame');
open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
or die_error(undef, "Couldn't cat $file_name, $hash"); or die_error(undef, "Couldn't cat $file_name, $hash");
my $mimetype = blob_mimetype($fd, $file_name); my $mimetype = blob_mimetype($fd, $file_name);
@ -2570,7 +2572,7 @@ sub git_tree {
my $ref = format_ref_marker($refs, $hash_base); my $ref = format_ref_marker($refs, $hash_base);
git_header_html(); git_header_html();
my $base = ""; my $base = "";
my $have_blame = gitweb_check_feature('blame'); my ($have_blame) = gitweb_check_feature('blame');
if (defined $hash_base && (my %co = parse_commit($hash_base))) { if (defined $hash_base && (my %co = parse_commit($hash_base))) {
git_print_page_nav('tree','', $hash_base); git_print_page_nav('tree','', $hash_base);
git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base); git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);