From: Joey Hess <joey@kitenet.net>
Date: Thu, 11 Jul 2013 01:52:43 +0000 (-0400)
Subject: Pass --no-edit when used with git 1.7.8 and newer.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/946af13ae60da6a8688e66bbe17dd1a012e5d747

Pass --no-edit when used with git 1.7.8 and newer.

Not sure if this is needed to avoid it trying to run an editor. Probably
there is never a controlling terminal and probably git notices and does
nothing. But I'm just copying what I have in git-annex assistant here.

(Although with a much worse git version comparion, that only really works due
to luck.)
---

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 0852ce10d..bbdcbdba8 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -550,6 +550,9 @@ 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.7.8") {
+			push @opts, "--allow-empty-message", "--no-edit";
+		}
 		if ($version ge "1.7.2") {
 			push @opts, "--allow-empty-message";
 		}
diff --git a/debian/changelog b/debian/changelog
index 22dc3eb47..242460ca3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ 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.
+  * Pass --no-edit when used with git 1.7.8 and newer.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 10 Jul 2013 21:49:23 -0400