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

diff --git a/dgit b/dgit
index 40b8e32a..ccf50094 100755
--- a/dgit
+++ b/dgit
@@ -3380,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
@@ -3498,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 = ();