From ca627567e920d664c2b3eaf304592e011e6b4e24 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 26 Dec 2016 18:18:45 +0000 Subject: [PATCH] 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. --- IkiWiki/Plugin/git.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 { -- 2.39.2