diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | dgit | 5 | ||||
| -rwxr-xr-x | tests/tests/unrepresentable | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index f91290e..478ad5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ dgit (3.12~) unstable; urgency=medium * dgit import: Defend against broken symlinks in .. * dgit import: Right error message for missing files in .. * dgit import: Avoid making broken symlinks in .. + * quilt fixup: Tolerate deletion of executable files. Important bugfixes to other components: * dgit-repos-server: Do not reject commits with no author/committer @@ -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" diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable index 206af86..80b5a05 100755 --- a/tests/tests/unrepresentable +++ b/tests/tests/unrepresentable @@ -30,7 +30,7 @@ badly-1 orig-symlink 'modified symlink' git add orig-symlink badly-2 -badly-1 orig-symlink 'non-default mode or type' +badly-1 orig-symlink 'deletion of symlink' git rm -f orig-symlink badly-2 |