git-debrebase: convert-from-gbp: Use same algorithm for finding upstream

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 5d3c7426da687046ae3dccabc134cab99f484458..2687ef1f6873240c22feb16df93621328841c809 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1604,11 +1604,18 @@ sub cmd_make_patches () {
 }
 
 sub cmd_convert_from_gbp () {
-    badusage "needs 1 optional argument, the upstream git rev"
+    badusage "want only 1 optional argument, the upstream git commitish"
        unless @ARGV<=1;
+
+    my $clogp = parsechangelog();
+    my $version = $clogp->{'Version'}
+       // die "missing Version from changelog";
+
     my ($upstream_spec) = @ARGV;
-    $upstream_spec //= 'refs/heads/upstream';
-    my $upstream = git_rev_parse $upstream_spec;
+
+    my ($upstream, $upstream_version) =
+       resolve_upstream_version($upstream_spec, $version);
+
     my $old_head = get_head();
 
     my $upsdiff = get_differs $upstream, $old_head;