X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;fp=dgit;h=d1bf2136a6d86550f847e5d071322a3227885864;hb=242ba73109ae30e7d8849b01f0c668b87d4f4d63;hp=1f1563075bbc065d80fea603c5e5e2bb05d41631;hpb=a4d27ce9d75fc04b74daf8dfc93f5107c2b96778;p=dgit.git

diff --git a/dgit b/dgit
index 1f156307..d1bf2136 100755
--- a/dgit
+++ b/dgit
@@ -4920,9 +4920,8 @@ sub quiltify_trees_differ ($$;$$$) {
 		    die "modified symlink\n" unless $newmode =~ m/^10/;
 		} elsif ($oldmode =~ m/[^0]/) {
 		    # deletion
-		    die "non-default mode or type\n"
-			unless $newmode =~ m/^100644$/ ||
-			       $oldmode =~ m/^100644$/;
+		    die "deletion of symlink\n"
+			unless $oldmode =~ m/^10/;
 		} else {
 		    # creation
 		    die "non-default mode or type\n"