From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Aug 2018 06:52:38 +0000 (+0100)
Subject: git-debrebase: Have resolve_upstream_commit set @$tried first
X-Git-Tag: archive/debian/6.5~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=32a64c4b2ca401cd594c38ceaa01a2bdfc56f8eb

git-debrebase: Have resolve_upstream_commit set @$tried first

This allows a caller to know what tag name was successfully found,
by looking at $tried[-1];

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 35284d52..13c320e8 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1190,8 +1190,8 @@ sub upstream_commitish_search ($$) {
     foreach my $tagpfx ('', 'v', 'upstream/') {
 	my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
 	my $new_upstream = git_get_ref "refs/tags/$tag";
-	return $new_upstream if length $new_upstream;
 	push @$tried, $tag;
+	return $new_upstream if length $new_upstream;
     }
 }