diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/git-debrebase b/git-debrebase index eb585e3..39b700a 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1994,28 +1994,6 @@ sub do_stitch ($;$) { stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose); } -sub resolve_upstream_version ($$) { - my ($new_upstream, $upstream_version) = @_; - - my $used = $new_upstream; - if (!defined $new_upstream) { - my @tried; - $new_upstream = upstream_commitish_search $upstream_version, \@tried; - if (!length $new_upstream) { - fail f_ - "Could not determine appropriate upstream commitish.\n". - " (Tried these tags: %s)\n". - " Check version, and specify upstream commitish explicitly.", - "@tried"; - } - $used = $tried[-1]; - } - $new_upstream = git_rev_parse $new_upstream; - - return ($new_upstream, $used); - # used is a human-readable idea of what we found -} - sub cmd_new_upstream () { # automatically and unconditionally launders before rebasing # if rebase --abort is used, laundering has still been done |