From: Simon McVittie <smcv@debian.org>
Date: Mon, 26 Dec 2016 18:18:45 +0000 (+0000)
Subject: Revert "Tell `git revert` not to follow renames (CVE-2016-10026)"
X-Git-Tag: debian/3.20120629.2+deb7u2~32
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ed2935484496366578d25c13650139ddac8dfb8d?ds=inline;hp=b96507ee3bc891becd9078ec7556daa29f2cf513

Revert "Tell `git revert` not to follow renames (CVE-2016-10026)"

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 641e397eb..75b89e476 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -944,9 +944,7 @@ sub rcs_revert ($) {
 	my $rev = shift;
 	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
 
-	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 {