dgit: Copy several user.* settings from main tree git local config

Copy to dgit private workarea.  Closes:#853085.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 4bfbca2191cbe2665d6e6da8f93b56355e48511f..0c80ccf0ede74e50806379ea683a4313d5aecaae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dgit (3.10~) unstable; urgency=medium
 
-  * 
+  Bugfixes:
+  * dgit: Copy several user.* settings from main tree git local config
+    to dgit private workarea.  Closes:#853085.
 
  --
 

diff --git a/dgit b/dgit
index 9cdf96b5226d80c378ec6f69eed37ad26b4f3e25..7ffbb89b8303d895a6520bb063137c3f2f7c4824 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1699,6 +1699,11 @@ sub prep_ud (;$) {
 sub mktree_in_ud_here () {
     runcmd qw(git init -q);
     runcmd qw(git config gc.auto 0);
+    foreach my $copy (qw(user.email user.name user.useConfigOnly)) {
+       my $v = $gitcfgs{local}{$copy};
+       next unless $v;
+       runcmd qw(git config), $copy, $_ foreach @$v;
+    }
     rmtree('.git/objects');
     symlink '../../../../objects','.git/objects' or die $!;
     setup_gitattrs(1);