From: Simon McVittie <smcv@debian.org>
Date: Sat, 7 Jan 2017 13:36:10 +0000 (+0000)
Subject: git-cgi.t: when committing directly, make sure we have a valid author
X-Git-Tag: debian/3.20141016.4~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/42e6049182c6b9cc7ae2d28f3884916555f02551

git-cgi.t: when committing directly, make sure we have a valid author

In the environment used on ci.debian.net, we have neither a name nor
an email address.

(cherry picked from commit ca1b06d599c610643495100186a1786d9c3dcc35)
---

diff --git a/t/git-cgi.t b/t/git-cgi.t
index 6dfe18ad6..ee77257b9 100755
--- a/t/git-cgi.t
+++ b/t/git-cgi.t
@@ -142,7 +142,12 @@ sub run_git {
 	my ($in, $out);
 	ok(run(['git', @$args], \$in, \$out, init => sub {
 		chdir 't/tmp/in' or die $!;
-		$ENV{EMAIL} = 'nobody@ikiwiki-tests.invalid';
+		my $name = 'The IkiWiki Tests';
+		my $email = 'nobody@ikiwiki-tests.invalid';
+		if ($args->[0] eq 'commit') {
+			$ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
+			$ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
+		}
 	}), "$desc at $filename:$line");
 	return $out;
 }