X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=3cf7705dd052d8b6a1bb15737486bf9911ed686c;hp=40b8e32aba4a6378f742381076d1812b239c45f1;hb=6fab00d6201f741f87cc89a0a24443db584c4162;hpb=37679efe82686b5fb1ba4d198c6df41a9e1fa52d

diff --git a/dgit b/dgit
index 40b8e32a..3cf7705d 100755
--- a/dgit
+++ b/dgit
@@ -493,12 +493,6 @@ sub url_get {
 
 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
 
-sub runcmd {
-    debugcmd "+",@_;
-    $!=0; $?=-1;
-    failedcmd @_ if system @_;
-}
-
 sub act_local () { return $dryrun_level <= 1; }
 sub act_scary () { return !$dryrun_level; }
 
@@ -3380,10 +3374,11 @@ END
 	return;
     }
     my $af = ".git/info/attributes";
+    ensuredir '.git/info';
     open GAO, "> $af.new" or die $!;
     print GAO <<END or die $!;
 *	dgit-defuse-attrs
-[attr]dgit-defuse-attrs	-text -eol -crlf -ident -filter
+[attr]dgit-defuse-attrs	$negate_harmful_gitattrs
 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
 END
     my $gai = open_gitattrs();
@@ -3498,6 +3493,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 = ();
@@ -3911,6 +3907,7 @@ sub splitbrain_pseudomerge ($$$$) {
     #
 
     return $dgitview unless defined $archive_hash;
+    return $dgitview if deliberately_not_fast_forward();
 
     printdebug "splitbrain_pseudomerge...\n";
 
@@ -4889,7 +4886,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;
@@ -4908,16 +4905,23 @@ sub quiltify_trees_differ ($$;$$$) {
 
 	if ($unrepres) {
 	    eval {
-		die "not a plain file\n"
-		    unless $newmode =~ m/^10\d{4}$/ ||
-		           $oldmode =~ m/^10\d{4}$/;
+		die "not a plain file or symlink\n"
+		    unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
+		           $oldmode =~ m/^(?:10|12)\d{4}$/;
 		if ($oldmode =~ m/[^0]/ &&
 		    $newmode =~ m/[^0]/) {
-		    die "mode changed\n" if $oldmode ne $newmode;
+		    # both old and new files exist
+		    die "mode or type changed\n" if $oldmode ne $newmode;
+		    die "modified symlink\n" unless $newmode =~ m/^10/;
+		} elsif ($oldmode =~ m/[^0]/) {
+		    # deletion
+		    die "deletion of symlink\n"
+			unless $oldmode =~ m/^10/;
 		} else {
-		    die "non-default mode\n"
-			unless $newmode =~ m/^100644$/ ||
-			       $oldmode =~ m/^100644$/;
+		    # creation
+		    die "creation with non-default mode\n"
+			unless $newmode =~ m/^100644$/ or
+			       $newmode =~ m/^120000$/;
 		}
 	    };
 	    if ($@) {
@@ -5272,6 +5276,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 $@;
@@ -5310,6 +5315,7 @@ sub quiltify ($$$$) {
 	    $patchname =~ y/-a-z0-9_.+=~//cd;
 	    $patchname =~ s/^\W/x-$&/;
 	    $patchname = substr($patchname,0,40);
+	    $patchname .= ".patch";
 	}
 	if (!defined $patchdir) {
 	    $patchdir = '';
@@ -6345,7 +6351,10 @@ END
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	my $here = "../$f";
-	next if lstat $here;
+	if (lstat $here) {
+	    next if stat $here;
+	    fail "lstat $here works but stat gives $! !";
+	}
 	fail "stat $here: $!" unless $! == ENOENT;
 	my $there = $dscfn;
 	if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
@@ -6356,8 +6365,10 @@ END
 	    fail "cannot import $dscfn which seems to be inside working tree!";
 	}
 	$there =~ s#/+[^/]+$## or
-	    fail "cannot import $dscfn which seems to not have a basename";
+	    fail "import $dscfn requires ../$f, but it does not exist";
 	$there .= "/$f";
+	my $test = $there =~ m{^/} ? $there : "../$there";
+	stat $test or fail "import $dscfn requires $test, but: $!";
 	symlink $there, $here or fail "symlink $there to $here: $!";
 	progress "made symlink $here -> $there";
 #	print STDERR Dumper($fi);