From e61ace88409a7b6672a7589336dee8163fb5a216 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 8 Oct 2016 21:52:42 +0100
Subject: [PATCH] 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>
---
 dgit | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dgit b/dgit
index 4aff8637..368d764c 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 =
-- 
2.30.2