git-debrebase: Have resolve_upstream_commit set @$tried first

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index c11151305b2cdbc66003811692521ae3fec25106..13c320e888e982568cf00a265e44f85047f558b6 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1184,20 +1184,23 @@ sub do_stitch ($;$) {
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
 
-sub resolve_upstream_version ($$) {
-    my ($new_upstream, $version) = @_;
+sub upstream_commitish_search ($$) {
+    my ($upstream_version, $tried) = @_;
+    # todo: at some point maybe use git-deborig to do this
+    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;
+    }
+}
 
-    my $new_upstream_version = upstreamversion $version;
+sub resolve_upstream_version ($$) {
+    my ($new_upstream, $upstream_version) = @_;
 
     if (!defined $new_upstream) {
        my @tried;
-       # todo: at some point maybe use git-deborig to do this
-       foreach my $tagpfx ('', 'v', 'upstream/') {
-           my $tag = $tagpfx.(dep14_version_mangle $new_upstream_version);
-           $new_upstream = git_get_ref "refs/tags/$tag";
-           last if length $new_upstream;
-           push @tried, $tag;
-       }
+       $new_upstream = upstream_commitish_search $upstream_version, \@tried;
        if (!length $new_upstream) {
            fail "Could not determine appropriate upstream commitish.\n".
                " (Tried these tags: @tried)\n".
@@ -1206,7 +1209,7 @@ sub resolve_upstream_version ($$) {
     }
     $new_upstream = git_rev_parse $new_upstream;
 
-    return ($new_upstream, $new_upstream_version);
+    return $new_upstream;
 }
 
 sub cmd_new_upstream () {
@@ -1226,9 +1229,9 @@ sub cmd_new_upstream () {
     }
 
     my $new_upstream = shift @ARGV;
-    my $new_upstream_version;
-    ($new_upstream, $new_upstream_version) =
-       resolve_upstream_version $new_upstream, $new_version;
+    my $new_upstream_version = upstreamversion  $new_version;
+    $new_upstream =
+       resolve_upstream_version $new_upstream, $new_upstream_version;
 
     record_ffq_auto();
 
@@ -1635,8 +1638,9 @@ sub cmd_convert_from_gbp () {
 
     my ($upstream_spec) = @ARGV;
 
-    my ($upstream, $upstream_version) =
-       resolve_upstream_version($upstream_spec, $version);
+    my $upstream_version = upstreamversion $version;
+    my $upstream =
+       resolve_upstream_version($upstream_spec, $upstream_version);
 
     my $old_head = get_head();