summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-08 21:52:42 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-08 23:05:47 +0100
commite61ace88409a7b6672a7589336dee8163fb5a216 (patch)
tree30f7e7ebc69765b5fa8f422eb17611de8a1f26d3 /dgit
parent2eff224fc177203b2b38c12cc706210d1b422870 (diff)
Split brain: Set GIT_AUTHOR_* too
Sometimes the patches don't have authorship information, in which case using the caller's is wrong. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit5
1 files changed, 4 insertions, 1 deletions
diff --git a/dgit b/dgit
index 4aff863..368d764 100755
--- a/dgit
+++ b/dgit
@@ -3679,7 +3679,10 @@ sub quiltify_splitbrain ($$$$$$) {
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];
+
if ($quilt_mode =~ m/gbp|unapplied/ &&
($diffbits->{H2O} & 01)) {
my $msg =