X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=9a8d22147a9b0a80e93f54c20b64a5113c7e962a;hp=1502ddff922109ec771f25eecf09f3648b0bb57d;hb=1f7b9876c5641666901f40888eb8a975449569c1;hpb=185907d9a5936f4cf280372b817e5ecbf7df0a89

diff --git a/dgit b/dgit
index 1502ddff..9a8d2214 100755
--- a/dgit
+++ b/dgit
@@ -4460,7 +4460,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;
     }
 }
 
@@ -4495,12 +4495,16 @@ 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 ($@) {