From: Simon McVittie <smcv@debian.org>
Date: Mon, 30 Nov 2015 20:46:12 +0000 (+0000)
Subject: ensure_committer: don't do anything if we have the environment variables
X-Git-Tag: debian/3.20120629.2+deb7u2~29
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b24da2c9fa0c675f97b16773f3d366a78e9e94b8?ds=sidebyside;hp=f62b4f45039a1acb5f9173b0835475d28c1058a5

ensure_committer: don't do anything if we have the environment variables

(cherry picked from commit 1f635c6dcaeff8f869f874f659da875c4e7f1863)
---

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 9cebabea4..0140768ff 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -221,15 +221,18 @@ sub run_or_cry ($@) { safe_git(sub { warn @_ }, undef, @_) }
 sub run_or_non ($@) { safe_git(undef, undef, @_) }
 
 sub ensure_committer {
-	my $name = join('', run_or_non("git", "config", "user.name"));
-	my $email = join('', run_or_non("git", "config", "user.email"));
-
-	if (! length $name) {
-		run_or_die("git", "config", "user.name", "IkiWiki");
+	if (! length $ENV{GIT_AUTHOR_NAME} || ! length $ENV{GIT_COMMITTER_NAME}) {
+		my $name = join('', run_or_non("git", "config", "user.name"));
+		if (! length $name) {
+			run_or_die("git", "config", "user.name", "IkiWiki");
+		}
 	}
 
-	if (! length $email) {
-		run_or_die("git", "config", "user.email", "ikiwiki.info");
+	if (! length $ENV{GIT_AUTHOR_EMAIL} || ! length $ENV{GIT_COMMITTER_EMAIL}) {
+		my $email = join('', run_or_non("git", "config", "user.email"));
+		if (! length $email) {
+			run_or_die("git", "config", "user.email", "ikiwiki.info");
+		}
 	}
 }
 
@@ -585,8 +588,6 @@ sub rcs_commit_helper (@) {
 	
 	my %env=%ENV;
 
-	ensure_committer();
-
 	if (defined $params{session}) {
 		# Set the commit author and email based on web session info.
 		my $u;
@@ -610,6 +611,8 @@ sub rcs_commit_helper (@) {
 		}
 	}
 
+	ensure_committer();
+
 	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
 	my @opts;
 	if ($params{message} !~ /\S/) {