From: Simon McVittie <smcv@debian.org>
Date: Mon, 26 Dec 2016 16:30:43 +0000 (+0000)
Subject: Revert "Tell `git revert` not to follow renames"
X-Git-Tag: debian/3.20161229~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/469c842fd56ce811d431058714d9c2700a5314f8

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.
---

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 {