X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=1e7c923eea6e8070b3f2254af6f8a85570d05aa4;hb=e70e2c7b6a8411ba86462bf96988732ef3a4ddd0;hp=992d2dad4efcc70f1c3dad292c1ee5e12da129f9;hpb=7025b1143916f6a6b1abaeb8f8a58a0e9e8dc170;p=dgit.git

diff --git a/dgit b/dgit
index 992d2dad..1e7c923e 100755
--- a/dgit
+++ b/dgit
@@ -2367,6 +2367,8 @@ END
 	my $path = $ENV{PATH} or die;
 
 	foreach my $use_absurd (qw(0 1)) {
+	    runcmd @git, qw(checkout -q unpa);
+	    runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
 	    local $ENV{PATH} = $path;
 	    if ($use_absurd) {
 		chomp $@;
@@ -2383,11 +2385,12 @@ END
 		die "only absurd git-apply!\n" if !$use_absurd
 		    && forceing [qw(import-gitapply-absurd)];
 
-		local $ENV{PATH} = $path if $use_absurd;
+		local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
+		local $ENV{PATH} = $path                    if $use_absurd;
 
 		my @showcmd = (gbp_pq, qw(import));
 		my @realcmd = shell_cmd
-		    'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
+		    'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
 		debugcmd "+",@realcmd;
 		if (system @realcmd) {
 		    die +(shellquote @showcmd).
@@ -4459,7 +4462,7 @@ END
 	local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
 	local $ENV{'VISUAL'} = $ENV{'EDITOR'};
 	local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
-	runcmd @dpkgsource, qw(--commit .), $patchname;
+	runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
     }
 }
 
@@ -4494,17 +4497,21 @@ sub quiltify_trees_differ ($$;$$$) {
 
 	if ($unrepres) {
 	    eval {
-	        die "deleted\n" unless $newmode =~ m/[^0]/;
-		die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
-		if ($oldmode =~ m/[^0]/) {
+		die "not a plain file\n"
+		    unless $newmode =~ m/^10\d{4}$/ ||
+		           $oldmode =~ m/^10\d{4}$/;
+		if ($oldmode =~ m/[^0]/ &&
+		    $newmode =~ m/[^0]/) {
 		    die "mode changed\n" if $oldmode ne $newmode;
 		} else {
-		    die "non-default mode\n" unless $newmode =~ m/^100644$/;
+		    die "non-default mode\n"
+			unless $newmode =~ m/^100644$/ ||
+			       $oldmode =~ m/^100644$/;
 		}
 	    };
 	    if ($@) {
 		local $/="\n"; chomp $@;
-		push @$unrepres, [ $f, $@ ];
+		push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
 	    }
 	}