From b162563dc1c6126953e66cdcc508f389b9d39d8e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Jul 2013 21:48:16 -0400 Subject: [PATCH] Deal with git behavior change in 1.7.8 and newer that broke support for commits with an empty commit message. --- IkiWiki/Plugin/git.pm | 5 ++++- debian/changelog | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 3879abeae..0852ce10d 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -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 { diff --git a/debian/changelog b/debian/changelog index 8d55d5df8..22dc3eb47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 10 Jul 2013 21:49:23 -0400 + ikiwiki (3.20130710) unstable; urgency=low * blogspam: Fix encoding issue in RPC::XML call. -- 2.39.2