From 3ded43cef1435ea52ec41bc89243244dc959fd4f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 6 Jul 2019 18:37:03 +0100 Subject: dgit-repos-server: tag2upload: Better message from upstream mismatch Signed-off-by: Ian Jackson --- infra/dgit-repos-server | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index f5767ae..65fda22 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"; } -- cgit v1.2.3