diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2021-09-07 23:16:35 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2021-09-08 00:07:10 +0100 |
| commit | a0ac573f8359151786951ed5f4993a4322275759 (patch) | |
| tree | c0023e70de3c26ced4ab283725fdbdbc8ee34e89 | |
| parent | 7f77fa1ada1fd09c3de3c0e26ff683201c007cba (diff) | |
dgit: tolerate making quilt patches creating +x files
We allow files with mode 00755 too. This works now
This seems to have been an accidental extension to the source formaat,
resulting from an extension to GNU `diff` and `patch`, I think it is
fair to allow it now.
Closes: #949675
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | dgit | 1 | ||||
| -rwxr-xr-x | tests/tests/unrepresentable | 6 |
2 files changed, 1 insertions, 6 deletions
@@ -5435,6 +5435,7 @@ sub quiltify_trees_differ ($$;$$$) { # creation die __ "creation with non-default mode\n" unless $newmode =~ m/^100644$/ or + $newmode =~ m/^100755$/ or $newmode =~ m/^120000$/; } }; diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable index fcff784..fb1cf61 100755 --- a/tests/tests/unrepresentable +++ b/tests/tests/unrepresentable @@ -63,12 +63,6 @@ badly-1 src.c 'mode or type changed' git add src.c badly-2 -badly-1 new 'creation with non-default mode' - echo hi >new - chmod 755 new - git add new -badly-2 - start good |