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

Deal with git behavior change in 1.7.8 and newer that broke support for commits with an empty commit message.

master
Joey Hess 2013-07-10 21:48:16 -04:00
parent 697c3f1256
commit b162563dc1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IkiWiki/Plugin/git.pm
View File

@ -550,7 +550,10 @@ sub rcs_commit_helper (@) {
# Force git to allow empty commit messages.
# (If this version of git supports it.)
my ($version)=`git --version` =~ /git version (.*)/;
if ($version ge "1.5.4") {
if ($version ge "1.7.2") {
push @opts, "--allow-empty-message";
}
elsif ($version ge "1.5.4") {
push @opts, '--cleanup=verbatim';
}
else {

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ikiwiki (3.20130711) unstable; urgency=low
* Deal with git behavior change in 1.7.2 and newer that broke support
for commits with an empty commit message.
-- Joey Hess <joeyh@debian.org> Wed, 10 Jul 2013 21:49:23 -0400
ikiwiki (3.20130710) unstable; urgency=low
* blogspam: Fix encoding issue in RPC::XML call.