X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=9d3584fb7e0abd96b420e70a3f24def0b78ee20e;hb=3538250e45974480c88df3f4b2ed946ad97e896a;hp=1e7c923eea6e8070b3f2254af6f8a85570d05aa4;hpb=e70e2c7b6a8411ba86462bf96988732ef3a4ddd0;p=dgit.git

diff --git a/dgit b/dgit
index 1e7c923e..9d3584fb 100755
--- a/dgit
+++ b/dgit
@@ -3538,7 +3538,7 @@ tree $tree
 parent $dgitview
 parent $archive_hash
 author $authline
-commiter $authline
+committer $authline
 
 $msg_msg
 
@@ -5944,10 +5944,14 @@ END
 	    progress "Import, merging.";
 	    my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
 	    my $version = getfield $dsc, 'Version';
+	    my $clogp = commit_getclogp $newhash;
+	    my $authline = clogp_authline $clogp;
 	    $newhash = make_commit_text <<END;
 tree $tree
 parent $newhash
 parent $oldhash
+author $authline
+committer $authline
 
 Merge $package ($version) import into $dstbranch
 END