changelog: start 9.14

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 8ed836492df67bc54ada61f873d494e7a846fd98..4059e2b02372388d8c4107beda3a7e757bc9ff00 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';
@@ -632,12 +634,15 @@ sub git_check_unmodified () {
 sub upstream_commitish_search ($$) {
     my ($upstream_version, $tried) = @_;
     # todo: at some point maybe use git-deborig to do this
+    my @found;
     foreach my $tagpfx ('', 'v', 'upstream/') {
        my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
        my $new_upstream = git_get_ref "refs/tags/$tag";
        push @$tried, $tag;
-       return $new_upstream if length $new_upstream;
+       push @found, [ $tag, $new_upstream ] if $new_upstream;
     }
+    return @{ $found[0] } if @found == 1;
+    return ();
 }
 
 sub resolve_upstream_version ($$) {
@@ -647,7 +652,8 @@ sub resolve_upstream_version ($$) {
     my $message = __ 'using specified upstream commitish';
     if (!defined $new_upstream) {
        my @tried;
-       $new_upstream = upstream_commitish_search $upstream_version, \@tried;
+       ($used, $new_upstream) =
+           upstream_commitish_search $upstream_version, \@tried;
        if (!length $new_upstream) {
            fail f_
                "Could not determine appropriate upstream commitish.\n".
@@ -655,7 +661,6 @@ sub resolve_upstream_version ($$) {
                " Check version, and specify upstream commitish explicitly.",
                "@tried";
        }
-       $used = $tried[-1];
        $message = f_ 'using upstream from git tag %s', $used;
     } elsif ($new_upstream =~ m{^refs/tags/($versiontag_re)$}s) {
        $message = f_ 'using upstream from git tag %s', $1;
@@ -1055,7 +1060,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
 
@@ -1066,7 +1071,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 "$!";