From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 8 Oct 2016 20:53:35 +0000 (+0100)
Subject: New import: Set GIT_COMMITTER_* and GIT_AUTHOR_*
X-Git-Tag: archive/debian/2.0~79
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=305822addb2da1b3742cfabdfa71be50c39c48c1

New import: Set GIT_COMMITTER_* and GIT_AUTHOR_*

gbp pq import generates commits which are affected by these (COMMITTER
always and AUTHOR sometimes).  But we need imports to be stable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 368d764c..cdf16700 100755
--- a/dgit
+++ b/dgit
@@ -1833,7 +1833,18 @@ END
 	runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
 
 	runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
+
+	# We need the answers to be reproducible
+	my @authline = clogp_authline($clogp);
+	local $ENV{GIT_COMMITTER_NAME} =  $authline[0];
+	local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
+	local $ENV{GIT_COMMITTER_DATE} =  $authline[2];
+	local $ENV{GIT_AUTHOR_NAME} =  $authline[0];
+	local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
+	local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
+
 	runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
+
 	my $gapplied = git_rev_parse('HEAD');
 	my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
 	$gappliedtree eq $dappliedtree or