kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

gitweb: Fix error in git_patchest_body for file creation/deletion patch 

$from_id, $to_id variables should be local per PATCH.

Fix error in git_patchset_body for file creation (deletion) patches,
where instead of /dev/null as from-file (to-file) diff header line, it
had link to previous file with current file name.  This error occured
only if there was another patch before file creation (deletion) patch.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Jakub Narebski 2007-01-07 02:52:23 +01:00 committed by Junio C Hamano
parent fffe694d60
commit 62e4f26f3d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gitweb/gitweb.perl
View File

@ -2378,7 +2378,6 @@ sub git_patchset_body {
my $patch_line; my $patch_line;
my $diffinfo; my $diffinfo;
my (%from, %to); my (%from, %to);
my ($from_id, $to_id);


print "<div class=\"patchset\">\n"; print "<div class=\"patchset\">\n";


@ -2392,6 +2391,7 @@ sub git_patchset_body {
PATCH: PATCH:
while ($patch_line) { while ($patch_line) {
my @diff_header; my @diff_header;
my ($from_id, $to_id);


# git diff header # git diff header
#assert($patch_line =~ m/^diff /) if DEBUG; #assert($patch_line =~ m/^diff /) if DEBUG;
@ -2439,11 +2439,15 @@ sub git_patchset_body {
$from{'href'} = href(action=>"blob", hash_base=>$hash_parent, $from{'href'} = href(action=>"blob", hash_base=>$hash_parent,
hash=>$diffinfo->{'from_id'}, hash=>$diffinfo->{'from_id'},
file_name=>$from{'file'}); file_name=>$from{'file'});
} else {
delete $from{'href'};
} }
if ($diffinfo->{'status'} ne "D") { # not deleted file if ($diffinfo->{'status'} ne "D") { # not deleted file
$to{'href'} = href(action=>"blob", hash_base=>$hash, $to{'href'} = href(action=>"blob", hash_base=>$hash,
hash=>$diffinfo->{'to_id'}, hash=>$diffinfo->{'to_id'},
file_name=>$to{'file'}); file_name=>$to{'file'});
} else {
delete $to{'href'};
} }
# this is first patch for raw difftree line with $patch_idx index # this is first patch for raw difftree line with $patch_idx index
# we index @$difftree array from 0, but number patches from 1 # we index @$difftree array from 0, but number patches from 1