X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5c6f7a8d1b805001a3d1ee912683755cec773682..a14c2a9cd0f04062e32c218b799076adaf8b934e:/IkiWiki/Plugin/git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 48e71aa9a..e89813253 100644
--- 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);
 	}
 }