dgit: unrepres. changes: Tolerate deletion of executable files

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 1f1563075bbc065d80fea603c5e5e2bb05d41631..d1bf2136a6d86550f847e5d071322a3227885864 100755 (executable)
--- 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"