X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=be8cbeea2a8667a69e6f0c54a4b9bacc2ffad94a;hb=30f5b851da69cc63df7cfc1d6bda3eb7f41b21af;hp=314bd8c712c6159fe031bfe8073a62f902666f84;hpb=e9a3ab8ab115a663975026c84332a1d0bdc7264b;p=dgit.git diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 314bd8c7..be8cbeea 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -50,6 +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 $branchprefix initdebug enabledebug enabledebuglevel printdebug debugcmd @@ -65,6 +66,8 @@ our @EXPORT_OK; our $package_re = '[0-9a-z][-+.0-9a-z]*'; our $component_re = '[0-9a-zA-Z][-+.0-9a-zA-Z]*'; our $deliberately_re = "(?:TEST-)?$package_re"; +our $distro_re = $component_re; +our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+}; our $branchprefix = 'dgit'; # policy hook exit status bits @@ -311,6 +314,7 @@ sub git_rev_parse ($) { sub git_cat_file ($) { my ($objname) = @_; # => ($type, $data) or ('missing', undef) + # in scalar context, just the data our ($gcf_pid, $gcf_i, $gcf_o); if (!$gcf_pid) { my @cmd = qw(git cat-file --batch);