X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=867ba3c51e46b9ffa178506b46f4bc1c8a6dce7e;hp=d8a49dbc60351c60d3bee80e1b963b79b335e10f;hb=fc328b35ddc6e37c183383d5f8c6bb973dd0cc9b;hpb=b03d65e3455ddc7ec7ef7ac666693f2013841817

diff --git a/dgit b/dgit
index d8a49dbc..867ba3c5 100755
--- a/dgit
+++ b/dgit
@@ -1668,8 +1668,24 @@ sub setup_mergechangelogs (;$) {
     rename "$attrs.new", "$attrs" or die "$attrs: $!";
 }
 
+sub setup_useremail (;$) {
+    my ($always) = @_;
+    return unless $always || access_cfg_bool(1, 'setup-useremail');
+
+    my $setup = sub {
+	my ($k, $envvar) = @_;
+	my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
+	return unless defined $v;
+	set_local_git_config "user.$k", $v;
+    };
+
+    $setup->('email', 'DEBEMAIL');
+    $setup->('name', 'DEBFULLNAME');
+}
+
 sub setup_new_tree () {
     setup_mergechangelogs();
+    setup_useremail();
 }
 
 sub clone ($) {
@@ -3031,6 +3047,11 @@ sub cmd_setup_mergechangelogs {
     setup_mergechangelogs(1);
 }
 
+sub cmd_setup_useremail {
+    badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    setup_useremail(1);
+}
+
 sub cmd_setup_new_tree {
     badusage "no arguments allowed to dgit setup-tree" if @ARGV;
     setup_new_tree();