dgit: unrepres. changes: Tolerate deletion of executable files

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 8b9934b807c020233bc9f90d76487988460e2b30..d1bf2136a6d86550f847e5d071322a3227885864 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4915,9 +4915,15 @@ sub quiltify_trees_differ ($$;$$$) {
                           $oldmode =~ m/^(?:10|12)\d{4}$/;
                if ($oldmode =~ m/[^0]/ &&
                    $newmode =~ m/[^0]/) {
+                   # 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 {
+                   # creation
                    die "non-default mode or type\n"
                        unless $newmode =~ m/^100644$/ ||
                               $oldmode =~ m/^100644$/;