chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
3e041f7
)
git-debrebase: Have resolve_upstream_commit set @$tried first
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Aug 2018 06:52:38 +0000
(07:52 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Aug 2018 06:52:38 +0000
(07:52 +0100)
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>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 35284d52ed8391436aed027f18e7cb9e089ef82b..13c320e888e982568cf00a265e44f85047f558b6 100755
(executable)
--- 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;
}
}