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

[ikiwiki.git] / IkiWiki / Plugin / git.pm

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 (.*)/;
+               if ($version ge "1.7.8") {
+                       push @opts, "--allow-empty-message", "--no-edit";
+               }
                if ($version ge "1.7.2") {
                        push @opts, "--allow-empty-message";
                }