X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=42647ce02e79d277ef9a211e00eed5986387ffc3;hp=d1bf2136a6d86550f847e5d071322a3227885864;hb=c3db904b1de5630bd90655563f341d22e22986bc;hpb=242ba73109ae30e7d8849b01f0c668b87d4f4d63 diff --git a/dgit b/dgit index d1bf2136..42647ce0 100755 --- a/dgit +++ b/dgit @@ -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 ($@) {