diff options
| author | Joey Hess <joey@kitenet.net> | 2013-07-10 21:48:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-10 21:50:18 -0400 |
| commit | b162563dc1c6126953e66cdcc508f389b9d39d8e (patch) | |
| tree | 8e19b05fc27f31cf2951fed8d26e0546e08abfaf | |
| parent | 697c3f1256faa19776fbf203d1098154f53f319c (diff) | |
| download | ikiwiki-b162563dc1c6126953e66cdcc508f389b9d39d8e.tar ikiwiki-b162563dc1c6126953e66cdcc508f389b9d39d8e.tar.gz | |
Deal with git behavior change in 1.7.8 and newer that broke support for commits with an empty commit message.
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 5 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 11 insertions, 1 deletions
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 <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. |