gitweb: Fix error in git_patchset_body for deletion in merge commit

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 31152980df847bdabc4078b741d3e4910c40f883fce3ac2854e7a5f727ff2be3..43bf7440f4b627d61a969b9fe8cdcd5acc39d37493ab7820693160d7fc73c440 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -2723,8 +2723,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'});