dgit: honour more pre-tree git config options in our private trees

These share the user's object store and we should manipulate the
object store the way the user wants.  In particular,
core.sharedRepository is important.

Prompted by #867603, which is the same bug in dgit-badcommit-fixup.

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

diff --git a/debian/changelog b/debian/changelog
index 91bb617eeed93fe83e27bd6ea3644227b2098895..cd44b4025eb049ad232d7762ab49ddf9b8b89c7f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ dgit (3.11~) unstable; urgency=medium
     tree.
   * dgit: tolerate compressor terminating with SIGPIPE.
     Closes:#857694.
+  * dgit: honour more pre-tree git config options in our private
+    trees sharing the user's object store.  In particular,
+    core.sharedRepository.  Prompted by #867603.
   * infrastructure: Cope with new git-receive-pack which has
     quarantine feature: ie, work around #867702.
   * test suite: Cope with git restricting ext:: protocols.

diff --git a/dgit b/dgit
index edb242816306059e7b401880b0a9f9585ad7a527..be277f3e48e6daca67eec32aa30e7317cda8f194 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1713,7 +1713,10 @@ 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)) {
+    foreach my $copy (qw(user.email user.name user.useConfigOnly
+                         core.sharedRepository
+                         core.compression core.looseCompression
+                         core.bigFileThreshold core.fsyncObjectFiles)) {
        my $v = $gitcfgs{local}{$copy};
        next unless $v;
        runcmd qw(git config), $copy, $_ foreach @$v;