[PATCH 4/6] gitweb: Make blob diff -p1 like commit diff
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Aug 6, 2006, 00:13 UTC
- Message-ID
- <200608060213.50613.jnareb@gmail.com>
- In-Reply-To
- <200608060206.49086.jnareb@gmail.com>
Add 'a/' and 'b/' as prefix for blobdiff, blobdiff_plain, like it is in commitdiff, commitdiff_plain. Ensure that label for /dev/null is actually /dev/null.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- For consistency.
gitweb/gitweb.perl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index cdce481..f402c8f 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1236,6 +1236,8 @@ sub git_diff_print { print { $fd2 } <$fd>; close $fd2; close $fd; + } else { + $from_name = "/dev/null"; } # create tmp to-file @@ -1247,6 +1249,8 @@ sub git_diff_print { print { $fd2 } <$fd>; close $fd2; close $fd; + } else { + $to_name = "/dev/null"; } open my $fd, "-|", "/usr/bin/diff", @@ -2105,7 +2109,8 @@ sub git_blobdiff { " -> blob:" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, $hash) . "</div>\n"; - git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash); + git_diff_print($hash_parent, 'a/' . ($file_name || $hash_parent), + $hash, 'b/' . ($file_name || $hash)); print "</div>"; git_footer_html(); } @@ -2113,7 +2118,8 @@ sub git_blobdiff { sub git_blobdiff_plain { mkdir($git_temp, 0700); print $cgi->header(-type => "text/plain", -charset => 'utf-8'); - git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash, "plain"); + git_diff_print($hash_parent, 'a/' . ($file_name || $hash_parent), + $hash, 'b/' . ($file_name || $hash), "plain"); } sub git_commitdiff {
-- 1.4.1.1