X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=3de0aa9f1c1f62c569634e832b861e0f0dba0fc1;hb=f7e37ea9f83b46c5efa4152b36c6cc0f4b91fadd;hp=769b9b943644b91e0ca9893602c6da66aeff059c;hpb=1e87a7002be126e23144cd2b0a43271e522a75e7;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 769b9b94..3de0aa9f 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1140,7 +1140,23 @@ sub cmd_new_upstream_v0 () {
     my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1);
     my $new_upstream_version = $new_version->version();
 
-    my $new_upstream = git_rev_parse (shift @ARGV // 'upstream');
+    my $new_upstream = shift @ARGV;
+    if (!defined $new_upstream) {
+	my @tried;
+	# todo: at some point maybe use git-deborig to do this
+	foreach my $tagpfx ('', 'v', 'upstream/') {
+	    my $tag = $tagpfx.(dep14_version_mangle $new_upstream_version);
+	    $new_upstream = git_get_ref "refs/tags/$tag";
+	    last if length $new_upstream;
+	    push @tried, $tag;
+	}
+	if (!length $new_upstream) {
+	    fail "Could not determine appropriate upstream commitish.\n".
+		" (Tried these tags: @tried)\n".
+		" Check version, and specify upstream commitish explicitly.";
+	}
+    }
+    $new_upstream = git_rev_parse $new_upstream;
 
     record_ffq_auto();