summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2021-09-07 23:16:35 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2021-09-08 00:07:10 +0100
commita0ac573f8359151786951ed5f4993a4322275759 (patch)
treec0023e70de3c26ced4ab283725fdbdbc8ee34e89 /dgit
parent7f77fa1ada1fd09c3de3c0e26ff683201c007cba (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>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit1
1 files changed, 1 insertions, 0 deletions
diff --git a/dgit b/dgit
index 145fa9b..283f967 100755
--- a/dgit
+++ b/dgit
@@ -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$/;
}
};