auto-blog.setup: Don't enable opendiscussion by default; require users be logged...

[git.ikiwiki.info.git] / IkiWiki / Plugin / git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 48e71aa9aedfcf897996fa7d032d054af52717dc..e8981325357132c109b9160c11a2f0884f1ab8a8 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -794,8 +794,6 @@ sub git_parse_changes {
                                die $@ if $@;
                                my $fh;
                                ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
-                               # Ensure we run this in the right place,
-                               # see comments in rcs_receive.
                                my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ")
                                        . "git show $detail->{sha1_to} > '$path'";
                                if (system($cmd) != 0) {
@@ -838,20 +836,22 @@ sub rcs_receive () {
 
 sub rcs_preprevert ($) {
        my $rev=shift;
+       my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
 
-       return git_parse_changes(git_commit_info($rev, 1));
+       return git_parse_changes(git_commit_info($sha1, 1));
 }
 
 sub rcs_revert ($) {
        # Try to revert the given rev; returns undef on _success_.
        my $rev = shift;
+       my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
 
-       if (run_or_non('git', 'revert', '--no-commit', $rev)) {
+       if (run_or_non('git', 'revert', '--no-commit', $sha1)) {
                return undef;
        }
        else {
                run_or_die('git', 'reset', '--hard');
-               return sprintf(gettext("Failed to revert commit %s"), $rev);
+               return sprintf(gettext("Failed to revert commit %s"), $sha1);
        }
 }