summaryrefslogtreecommitdiff
path: root/Debian/Dgit.pm
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-09 14:45:17 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-09 16:25:53 +0100
commit166121d66d38a3f6584222a03558493c1a23de72 (patch)
tree97190dd6a94a926f4eca4bac43be5c1220f48e93 /Debian/Dgit.pm
parenta04897e74b24b59ed2a212d967f3698f08fec438 (diff)
dgit: Regularise patch filenames, and defend against funny commit subjects
* Do not specified patch names which look like series filenames * When we invent a filename based on a commit message, add ".patch". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'Debian/Dgit.pm')
-rw-r--r--Debian/Dgit.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index ba1c288..dcecbd1 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -50,7 +50,7 @@ BEGIN {
git_get_ref git_for_each_ref
git_for_each_tag_referring is_fast_fwd
$package_re $component_re $deliberately_re
- $distro_re $versiontag_re
+ $distro_re $versiontag_re $series_filename_re
$branchprefix
initdebug enabledebug enabledebuglevel
printdebug debugcmd
@@ -69,6 +69,7 @@ our $deliberately_re = "(?:TEST-)?$package_re";
our $distro_re = $component_re;
our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+};
our $branchprefix = 'dgit';
+our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s;
# policy hook exit status bits
# see dgit-repos-server head comment for documentation