]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Revert "Tell `git revert` not to follow renames"
authorSimon McVittie <smcv@debian.org>
Mon, 26 Dec 2016 16:30:43 +0000 (16:30 +0000)
committerSimon McVittie <smcv@debian.org>
Wed, 28 Dec 2016 21:32:12 +0000 (21:32 +0000)
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.

IkiWiki/Plugin/git.pm

index aef0c6cb1d13a38d9d3195519185f143e18f7318..64a47c8e863998e4a82ec245e54d9d1c71f95991 100644 (file)
@@ -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 {