summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Rcs/git.pm11
1 files changed, 10 insertions, 1 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 9f65e86aa..9306a513e 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -414,7 +414,16 @@ sub rcs_recentchanges ($) { #{{{
sub rcs_diff ($) { #{{{
my $rev=shift;
my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
- return join("\n", run_or_non("git", "diff", "$sha1^", $sha1));
+ my $ret;
+ foreach my $line (run_or_non("git", "show", $sha1)) {
+ if (defined $ret) {
+ $ret.=$line."\n";
+ }
+ elsif ($line=~/^diff --git/) {
+ $ret=$line."\n";
+ }
+ }
+ return $ret;
} #}}}
sub rcs_getctime ($) { #{{{