X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4fb26f4e60f2df282fc972e4b8506ccd306de789..4ff13b1890fa35dda9155a1585a9519c19b9205a:/IkiWiki/Plugin/git.pm diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 52b2bbd50..cf7fbe9b7 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -679,6 +679,7 @@ sub rcs_diff ($;$) { return if defined $maxlines && @lines == $maxlines; push @lines, $line."\n" if (@lines || $line=~/^diff --git/); + return 1; }; safe_git(undef, $addlines, "git", "show", $sha1); if (wantarray) { @@ -859,9 +860,8 @@ sub rcs_preprevert ($) { # in order to see all changes. my ($subdir, $rootdir) = git_find_root(); $git_dir=$rootdir; - my @commits=git_commit_info($sha1, 1); - $git_dir=undef; + my @commits=git_commit_info($sha1, 1); if (! @commits) { error "unknown commit"; # just in case } @@ -872,7 +872,10 @@ sub rcs_preprevert ($) { error gettext("you are not allowed to revert a merge"); } - return git_parse_changes(@commits); + my @ret=git_parse_changes(@commits); + + $git_dir=undef; + return @ret; } sub rcs_revert ($) {