diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-08 21:52:42 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-08 23:05:47 +0100 |
commit | e61ace88409a7b6672a7589336dee8163fb5a216 (patch) | |
tree | 30f7e7ebc69765b5fa8f422eb17611de8a1f26d3 /dgit | |
parent | 2eff224fc177203b2b38c12cc706210d1b422870 (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-x | dgit | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 = |