summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-04 16:48:43 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:47 +0100
commit16c86daecbed9ea9f265cb96c5a1502eabdf0609 (patch)
tree2dc2744cebaf0e8664513820a9fd852e8a07dde7 /dgit
parentba42f0850a5c10737136f67cf974bb9d2957530c (diff)
Split brain: Move GIT_COMMITTER_* setting to quiltify_splitbrain toplevel (nfc)
We want this to apply to any commits we use git to make, not just gbp-pq.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit9
1 files changed, 5 insertions, 4 deletions
diff --git a/dgit b/dgit
index 4edf982..73432bc 100755
--- a/dgit
+++ b/dgit
@@ -2559,15 +2559,16 @@ sub quiltify_splitbrain ($$) {
$diffbits = { %$diffbits };
$_ = !!$_ foreach values %$diffbits;
}
+ # We would like any commits we generate 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];
if ($quilt_mode =~ m/gbp|unapplied/ &&
($diffbits->{O2A} & 01) && # some patches
!($diffbits->{H2O} & 01)) { # but HEAD is like orig
quiltify_splitbrain_needed();
progress "creating patches-applied version using gbp-pq";
- 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];
open STDOUT, ">/dev/null" or die $!;
runcmd shell_cmd 'exec >/dev/null', @gbppq, qw(import);
}