From 5f85505265601823cc228fdc94d67d3b0ba582e4 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Thu, 17 May 2007 22:54:28 +0200 Subject: gitweb: Fix error in git_patchset_body for deletion in merge commit Checking if $diffinfo->{'status'} is equal 'D' is no longer the way to check if the file was deleted in result. For merge commits $diffinfo->{'status'} is reference to array of statuses for each parent. Use the fact that $diffinfo->{'to_id'} is all zeros as sign that file was deleted in result. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- gitweb/gitweb.perl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 6f5df9174e..66f306705f 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2722,8 +2722,9 @@ sub git_patchset_body { delete $from{'href'}; } } + $to{'file'} = $diffinfo->{'to_file'} || $diffinfo->{'file'}; - if ($diffinfo->{'status'} ne "D") { # not deleted file + if ($diffinfo->{'to_id'} ne ('0' x 40)) { # file exists in result $to{'href'} = href(action=>"blob", hash_base=>$hash, hash=>$diffinfo->{'to_id'}, file_name=>$to{'file'}); -- cgit v1.2.3