urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Simon McVittie 2016-12-29 20:35:46 +00:00
parent 04e322fd6b
commit afda054796
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/git.pm
View File

@ -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 {

7
debian/changelog vendored
View File

@ -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