From 946af13ae60da6a8688e66bbe17dd1a012e5d747 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Jul 2013 21:52:43 -0400 Subject: [PATCH 1/1] 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.) --- IkiWiki/Plugin/git.pm | 3 +++ debian/changelog | 1 + 2 files changed, 4 insertions(+) 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 Wed, 10 Jul 2013 21:49:23 -0400 -- 2.44.0