[PATCH 2/6] gitweb: Simplify git_diff_print
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Aug 6, 2006, 00:11 UTC
- Message-ID
- <200608060211.38604.jnareb@gmail.com>
- In-Reply-To
- <200608060206.49086.jnareb@gmail.com>
Copy to temporaty file more directly, not using temporary variable @file. Use list form of open for diff invocation (we cannot use git-diff because first it doesn't support -L/--label option, and we cannot generate diff between /dev/null and blob given by it's sha1 identifier).
Use "local $/ = undef;" for (temporary) slurp mode.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- gitweb/gitweb.perl | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 60113da..b72f12f 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1230,31 +1230,31 @@ sub git_diff_print { # create tmp from-file if (defined $from) { + local $/ = undef; $from_tmp = "$git_temp/gitweb_" . $$ . "_from"; open my $fd2, "> $from_tmp"; open my $fd, "-|", $GIT, "cat-file", "blob", $from; - my @file = <$fd>; - print $fd2 @file; + print { $fd2 } <$fd>; close $fd2; close $fd; } # create tmp to-file if (defined $to) { + local $/ = undef; $to_tmp = "$git_temp/gitweb_" . $$ . "_to"; open my $fd2, "> $to_tmp"; open my $fd, "-|", $GIT, "cat-file", "blob", $to; - my @file = <$fd>; - print $fd2 @file; + print { $fd2 } <$fd>; close $fd2; close $fd; } - open my $fd, "-|", "/usr/bin/diff -u -p -L \'$from_name\' -L \'$to_name\' $from_tmp $to_tmp"; + open my $fd, "-|", "/usr/bin/diff", + '-u', '-p', '-L', $from_name, '-L', $to_name, $from_tmp, $to_tmp; if ($format eq "plain") { - undef $/; + local $/ = undef; print <$fd>; - $/ = "\n"; } else { while (my $line = <$fd>) { chomp $line;
-- 1.4.1.1