From 305822addb2da1b3742cfabdfa71be50c39c48c1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 8 Oct 2016 21:53:35 +0100 Subject: 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 --- dgit | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'dgit') diff --git a/dgit b/dgit index 368d764..cdf1670 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 -- cgit v1.2.3