diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-08 21:53:35 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-08 23:05:47 +0100 |
commit | 305822addb2da1b3742cfabdfa71be50c39c48c1 (patch) | |
tree | f918152fb7c61e65b4997d5d2d47d46fae8cce10 | |
parent | e61ace88409a7b6672a7589336dee8163fb5a216 (diff) |
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>
-rwxr-xr-x | dgit | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -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 |