Dgit: Break out $tarball_f_ext_re.

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 9d4e78e18c2907ea47433cdd83982cedac5c3750..5d898ae5f6ab1c33e1f2f043d5c684bd1fe5005b 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -68,7 +68,8 @@ BEGIN {
                      reflog_cache_insert reflog_cache_lookup
                       $package_re $component_re $suite_re $deliberately_re
                      $distro_re $versiontag_re $series_filename_re
-                     $orig_f_comp_re $orig_f_sig_re $orig_f_tail_re
+                     $orig_f_comp_re $orig_f_sig_re
+                     $tarball_f_ext_re $orig_f_tail_re
                      $extra_orig_namepart_re
                      $git_null_obj
                       $branchprefix
@@ -107,7 +108,8 @@ our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s;
 our $extra_orig_namepart_re = qr{[-0-9a-zA-Z]+};
 our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?};
 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
-our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
+our $tarball_f_ext_re = "\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
+our $orig_f_tail_re = "$orig_f_comp_re$tarball_f_ext_re";
 our $git_null_obj = '0' x 40;
 our $ffq_refprefix = 'ffq-prev';
 our $gdrlast_refprefix = 'debrebase-last';
@@ -987,7 +989,7 @@ sub reflog_cache_lookup ($$) {
 #    changedir playground
 #    changedir $maindir
 #
-#    playtree_setup $local_git_cfg
+#    playtree_setup
 #            # ^ call in some (perhaps trivial) subdir of playground
 #
 #    rmtree playground
@@ -1046,9 +1048,7 @@ sub fresh_playground ($) {
 
 # ----- playtrees -----
 
-sub playtree_setup (;$) {
-    my ($t_local_git_cfg) = @_;
-    $t_local_git_cfg //= $local_git_cfg;
+sub playtree_setup () {
     # for use in the playtree
     # $maindir must be set, eg by calling record_maindir or fresh_playground
     # this is confusing: we have
@@ -1057,7 +1057,7 @@ sub playtree_setup (;$) {
     #   $maindir_gitdir     contains our main working "dgit", HEAD, etc.
     #   $maindir_gitcommon  the shared stuff, including .objects
 
-    # we need to invoke git-playtree-create via git because
+    # we need to invoke git-playtree-setup via git because
     # there may be config options it needs which are only available
     # to us, sensibly, in @git
 
@@ -1068,7 +1068,7 @@ sub playtree_setup (;$) {
     # @INC is conveniently available.
     my $newpath = join ':', +(grep { !m/:/ } @INC),
                  '/usr/share/dgit', $ENV{PATH};
-    runcmd qw(env), "PATH=$newpath", @git, qw(playtree-create .);
+    runcmd qw(env), "PATH=$newpath", @git, qw(playtree-setup .);
 
     ensuredir '.git/info';
     open GA, "> .git/info/attributes" or confess "$!";