X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=b8d6826928af835898ef5ea85a032ce7682a4758;hb=18413810f983efbd083a2fd0cbc2c2cbbadc558b;hp=be277f3e48e6daca67eec32aa30e7317cda8f194;hpb=814fa4dc0dbf43f7b2ec57803a155d03ba136a9b;p=dgit.git

diff --git a/dgit b/dgit
index be277f3e..b8d68269 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 = ();
@@ -3612,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();
 
@@ -3623,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";
 
@@ -3908,6 +3913,7 @@ sub splitbrain_pseudomerge ($$$$) {
     #
 
     return $dgitview unless defined $archive_hash;
+    return $dgitview if deliberately_not_fast_forward();
 
     printdebug "splitbrain_pseudomerge...\n";
 
@@ -4886,7 +4892,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;
@@ -5269,6 +5275,7 @@ sub quiltify ($$$$) {
 		die "contains unexpected slashes\n" if m{//} || m{/$};
 		die "contains leading punctuation\n" if m{^\W} || m{/\W};
 		die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
+		die "is series file\n" if m{$series_filename_re}o;
 		die "too long" if length > 200;
 	    };
 	    return $_ unless $@;
@@ -5307,6 +5314,7 @@ sub quiltify ($$$$) {
 	    $patchname =~ y/-a-z0-9_.+=~//cd;
 	    $patchname =~ s/^\W/x-$&/;
 	    $patchname = substr($patchname,0,40);
+	    $patchname .= ".patch";
 	}
 	if (!defined $patchdir) {
 	    $patchdir = '';