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 0852ce10d35c403d3f744269848d408c411d11f2..bbdcbdba82aba3b4c6499245e5d8f6bc9f041285 100644 (file)
--- 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 (.*)/;
                # 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";
                }
                if ($version ge "1.7.2") {
                        push @opts, "--allow-empty-message";
                }

diff --git a/debian/changelog b/debian/changelog
index 22dc3eb47e4554a90d42f315b26460e3e648b683..242460ca3b086ed7bfd68a7bc6e7b435c069537a 100644 (file)
--- 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.
 
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 10 Jul 2013 21:49:23 -0400