From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 31 Jul 2008 23:35:37 +0000 (-0400)
Subject: Merge branch 'master' into autoconfig
X-Git-Tag: 2.60~142
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=041923a89ece8b1ed195cb7b528843c15770ea6f

Merge branch 'master' into autoconfig

Conflicts:

	IkiWiki/Plugin/git.pm
	debian/changelog
	po/ikiwiki.pot
---

041923a89ece8b1ed195cb7b528843c15770ea6f
diff --cc IkiWiki/Plugin/git.pm
index 6f0ac56d5,1fa9188aa..b683e4ec3
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@@ -414,11 -336,23 +414,23 @@@ sub rcs_commit_staged ($$$) 
  		$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
  	}
  
 -	$message = possibly_foolish_untaint($message);
++	$message = IkiWiki::possibly_foolish_untaint($message);
+ 	my @opts;
+ 	if ($message !~ /\S/) {
+ 		# Force git to allow empty commit messages.
+ 		# (If this version of git supports it.)
+ 		my ($version)=`git --version` =~ /git version (.*)/;
+ 		if ($version ge "1.5.4") {
+ 			push @opts, '--cleanup=verbatim';
+ 		}
+ 		else {
+ 			$message.=".";
+ 		}
+ 	}
+ 	push @opts, '-q';
  	# git commit returns non-zero if file has not been really changed.
  	# so we should ignore its exit status (hence run_or_non).
- 	$message = IkiWiki::possibly_foolish_untaint($message);
- 	if (run_or_non('git', 'commit', '--cleanup=verbatim',
- 	               '-q', '-m', $message)) {
+ 	if (run_or_non('git', 'commit', @opts, '-m', $message)) {
  		if (length $config{gitorigin_branch}) {
  			run_or_cry('git', 'push', $config{gitorigin_branch});
  		}
diff --cc debian/changelog
index 4954c7737,1290904f8..440910313
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,4 +1,20 @@@
 +ikiwiki (2.60) UNRELEASED; urgency=low
 + 
 +  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
 +    can be used create a new wiki in seconds.
 +  * Add getsetup hook, all plugins that add fields to %config should use it.
 +  * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
 +    current configuration.
 +  * Large amounts of internal config data reorg.
 +  * The way wrappers are defined in the setup file has changed. Old setup
 +    files will continue to work, for now.
 +  * Version control backends promoted to first-class plugins.
 +  * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
 +    always to add.
 +
 + -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 +
- ikiwiki (2.56) UNRELEASED; urgency=low
+ ikiwiki (2.56) unstable; urgency=low
  
    * autoindex: New plugin that generates missing index pages.
      (Sponsored by The TOVA Company.)