summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-04 07:52:38 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-04 07:52:38 +0100
commit32a64c4b2ca401cd594c38ceaa01a2bdfc56f8eb (patch)
tree3eadf8de8c4e9a84323983f7b677421c105e7f64
parent3e041f7eae8fcac38d485e17df481b9b0aeef9b8 (diff)
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>
-rwxr-xr-xgit-debrebase2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 35284d5..13c320e 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;
}
}