diff options
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4924,9 +4924,9 @@ sub quiltify_trees_differ ($$;$$$) { unless $oldmode =~ m/^10/; } else { # creation - die "non-default mode or type\n" - unless $newmode =~ m/^100644$/ || - $oldmode =~ m/^100644$/; + die "creation with non-default mode\n" + unless $newmode =~ m/^100644$/ or + $newmode =~ m/^120000$/; } }; if ($@) { |