X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=91172dad890a4e25442cc83e9fa832a426e64296;hb=a04897e74b24b59ed2a212d967f3698f08fec438;hp=43f3fd38916f2bac98f06a5e1b0988205fef7e45;hpb=3441896d54a67afcf18987eed287061d2afea956;p=dgit.git

diff --git a/dgit b/dgit
index 43f3fd38..91172dad 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;
@@ -2181,7 +2184,7 @@ sub generate_commits_from_dsc () {
 		if defined $compr_ext && !defined $cname;
 	    my $compr_proc =
 		new Dpkg::Compression::Process compression => $cname;
-	    my @compr_cmd = $compr_proc->get_uncompress_cmdline();
+	    @compr_cmd = $compr_proc->get_uncompress_cmdline();
 	    my $compr_fh = new IO::Handle;
 	    my $compr_pid = open $compr_fh, "-|" // die $!;
 	    if (!$compr_pid) {
@@ -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";
 
@@ -4883,7 +4891,7 @@ sub quiltify_trees_differ ($$;$$$) {
     #  a list of unrepresentable changes (removals of upstream files
     #  (as messages)
     local $/=undef;
-    my @cmd = (@git, qw(diff-tree -z));
+    my @cmd = (@git, qw(diff-tree -z --no-renames));
     push @cmd, qw(--name-only) unless $unrepres;
     push @cmd, qw(-r) if $finegrained || $unrepres;
     push @cmd, $x, $y;