diff options
| -rwxr-xr-x | dgit | 11 | ||||
| -rwxr-xr-x | tests/tests/unrepresentable | 6 |
2 files changed, 9 insertions, 8 deletions
@@ -4910,14 +4910,15 @@ sub quiltify_trees_differ ($$;$$$) { if ($unrepres) { eval { - die "not a plain file\n" - unless $newmode =~ m/^10\d{4}$/ || - $oldmode =~ m/^10\d{4}$/; + die "not a plain file or symlink\n" + unless $newmode =~ m/^(?:10|12)\d{4}$/ || + $oldmode =~ m/^(?:10|12)\d{4}$/; if ($oldmode =~ m/[^0]/ && $newmode =~ m/[^0]/) { - die "mode changed\n" if $oldmode ne $newmode; + die "mode or type changed\n" if $oldmode ne $newmode; + die "modified symlink\n" unless $newmode =~ m/^10/; } else { - die "non-default mode\n" + die "non-default mode or type\n" unless $newmode =~ m/^100644$/ || $oldmode =~ m/^100644$/; } diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable index fa71bd3..206af86 100755 --- a/tests/tests/unrepresentable +++ b/tests/tests/unrepresentable @@ -25,12 +25,12 @@ badly-2 () { attempt } -badly-1 orig-symlink 'not a plain file' +badly-1 orig-symlink 'modified symlink' ln -sf NEWTARGET orig-symlink git add orig-symlink badly-2 -badly-1 orig-symlink 'not a plain file' +badly-1 orig-symlink 'non-default mode or type' git rm -f orig-symlink badly-2 @@ -39,7 +39,7 @@ start git commit -m deleted attempt -badly-1 src.c 'mode changed' +badly-1 src.c 'mode or type changed' chmod +x src.c git add src.c badly-2 |