From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jul 2019 17:37:03 +0000 (+0100)
Subject: dgit-repos-server: tag2upload: Better message from upstream mismatch
X-Git-Tag: archive/debian/9.1~35
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3ded43cef1435ea52ec41bc89243244dc959fd4f

dgit-repos-server: tag2upload: Better message from upstream mismatch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index f5767aef..65fda22d 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -1260,7 +1260,9 @@ END
     }
     # this is just to get the orig, so we don't really care about the ref
     if (defined $upstreamc) {
-	$upstreamc eq git_rev_parse "refs/tags/$upstreamt" or die;
+	my $need_upstreamc = git_rev_parse "refs/tags/$upstreamt";
+	$upstreamc eq $need_upstreamc or reject
+	    "upstream-commitish=$upstreamc but tag refers to $need_upstreamc";
 	runcmd qw(git deborig), "$upstreamc";
     }