git: Attribute reverts to the user doing the revert, not the wiki itself

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 0ee49416ba95b4891b7e5deb42f7ff08502f4e36..3248f9d8fda71f915fc30f8db6b2cfb5deac08ed 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -1099,7 +1099,7 @@ sub rcs_revert ($) {
 
        ensure_committer();
 
-       if (run_or_non('git', 'merge', '--ff-only', "ikiwiki_revert_$sha1")) {
+       if (run_or_non('git', 'cherry-pick', '--no-commit', "ikiwiki_revert_$sha1")) {
                return undef;
        }
        else {

diff --git a/debian/changelog b/debian/changelog
index cd7e158a77d1e4900972a134e981faa71fecf69a..92d1b56973baf7b5bd214d00a4b076f7c44242b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20161229.1) UNRELEASED; urgency=medium
+
+  * git: Attribute reverts to the user doing the revert, not the wiki
+    itself.
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 29 Dec 2016 20:35:51 +0000
+
 ikiwiki (3.20161229) unstable; urgency=medium
 
   * Security: force CGI::FormBuilder->field to scalar context where