From: Simon McVittie <smcv@debian.org>
Date: Thu, 29 Dec 2016 20:35:46 +0000 (+0000)
Subject: git: Attribute reverts to the user doing the revert, not the wiki itself
X-Git-Tag: debian/3.20120629.2+deb7u2~17
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a241942f17b8ffbc0d4f3251aad00708271b8344

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

(cherry picked from commit afda05479645ccf64bc2cb534d023c5a8cb0a5ae)
---

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index d1cb247de..c976ca9a2 100644
--- 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 {