X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=ccf50094397d22f6f7ddb227e5ec3eb4baf36a3b;hb=09201af19c2a9476ff35f56c002d1721d444abcb;hp=6f98813230a8a29db44564cc784bdeaf91e44f29;hpb=d49ec0833c03e428cc5a807331b389f1a70cab74;p=dgit.git

diff --git a/dgit b/dgit
index 6f988132..ccf50094 100755
--- 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;
@@ -2208,7 +2211,7 @@ sub generate_commits_from_dsc () {
 	!$? or failedcmd @tarcmd;
 
 	close $input or
-	    (@compr_cmd ? failedcmd @compr_cmd
+	    (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
 	     : die $!);
 	# finally, we have the results in "tarball", but maybe
 	# with the wrong permissions
@@ -3377,6 +3380,7 @@ END
 	return;
     }
     my $af = ".git/info/attributes";
+    ensuredir '.git/info';
     open GAO, "> $af.new" or die $!;
     print GAO <<END or die $!;
 *	dgit-defuse-attrs
@@ -3495,6 +3499,7 @@ sub fork_for_multisuite ($) {
     $before_fetch_merge->();
 
     foreach my $tsuite (@suites[1..$#suites]) {
+	$tsuite =~ s/^-/$cbasesuite-/;
 	my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
 					       sub {
             @end = ();
@@ -3609,6 +3614,9 @@ END
 }
 
 sub clone ($) {
+    # in multisuite, returns twice!
+    # once in parent after first suite fetched,
+    # and then again in child after everything is finished
     my ($dstdir) = @_;
     badusage "dry run makes no sense with clone" unless act_local();
 
@@ -3620,7 +3628,7 @@ sub clone ($) {
         printdebug "multi clone after fetch merge\n";
 	clone_set_head();
 	clone_finish($dstdir);
-	exit 0;
+	return;
     }
     printdebug "clone main body\n";