X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;fp=git-debrebase;h=39b700a51ea8cdd1c67deed10bab3b1b66472aa9;hb=cd800af2e4ca8fcf72e17555472af9aa37000b3e;hp=eb585e33ad4976add6238e6bd5fb442d7b85fe4b;hpb=359f4592c6035ee027cf283c6af7dcd435038776;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index eb585e33..39b700a5 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