diff options
| author | Joey Hess <joey@kitenet.net> | 2013-07-10 21:52:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-10 21:52:49 -0400 |
| commit | 946af13ae60da6a8688e66bbe17dd1a012e5d747 (patch) | |
| tree | 8b9bf923bb226c0a6a3a770d38ab71d1c6b1ae9b | |
| parent | b162563dc1c6126953e66cdcc508f389b9d39d8e (diff) | |
| download | ikiwiki-946af13ae60da6a8688e66bbe17dd1a012e5d747.tar ikiwiki-946af13ae60da6a8688e66bbe17dd1a012e5d747.tar.gz | |
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.)
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 4 insertions, 0 deletions
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 |