summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/git.pm
diff options
context:
space:
mode:
Diffstat (limited to 'IkiWiki/Plugin/git.pm')
-rw-r--r--IkiWiki/Plugin/git.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 47e806209..e89813253 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -836,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);
}
}