aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2016-12-26 16:30:43 +0000
committerSimon McVittie <smcv@debian.org>2016-12-28 21:32:12 +0000
commit469c842fd56ce811d431058714d9c2700a5314f8 (patch)
tree741e7e2c1db795bf8424a1d84099a4ee5fd27556 /IkiWiki
parentc1120bbbe8fdea20cf64fa12247f4f4a4006c834 (diff)
downloadikiwiki-469c842fd56ce811d431058714d9c2700a5314f8.tar
ikiwiki-469c842fd56ce811d431058714d9c2700a5314f8.tar.gz
Revert "Tell `git revert` not to follow renames"
This doesn't work prior to git 2.8: `git revert` silently ignores the option and succeeds. We will have to fix CVE-2016-10026 some other way. This reverts commit 9cada49ed6ad24556dbe9861ad5b0a9f526167f9.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/git.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index aef0c6cb1..64a47c8e8 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -982,9 +982,7 @@ sub rcs_revert ($) {
ensure_committer();
- if (run_or_non('git', 'revert', '--strategy=recursive',
- '--strategy-option=no-renames',
- '--no-commit', $sha1)) {
+ if (run_or_non('git', 'revert', '--no-commit', $sha1)) {
return undef;
}
else {