X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/672893634be9d7e7f2b44c27e4927021b12eedb6..862ca19eb1aee87e4ac05e8a5a9b326dd32dfe5d:/IkiWiki/Rcs/git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 9306a513e..1882b43ef 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -414,16 +414,18 @@ sub rcs_recentchanges ($) { #{{{
 sub rcs_diff ($) { #{{{
 	my $rev=shift;
 	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
-	my $ret;
+	my @lines;
 	foreach my $line (run_or_non("git", "show", $sha1)) {
-		if (defined $ret) {
-			$ret.=$line."\n";
-		}
-		elsif ($line=~/^diff --git/) {
-			$ret=$line."\n";
+		if (@lines || $line=~/^diff --git/) {
+			push @lines, $line."\n";
 		}
 	}
-	return $ret;
+	if (wantarray) {
+		return @lines;
+	}
+	else {
+		return join("", @lines);
+	}
 } #}}}
 
 sub rcs_getctime ($) { #{{{