diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-06 18:37:03 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-07 11:18:17 +0100 |
commit | 3ded43cef1435ea52ec41bc89243244dc959fd4f (patch) | |
tree | b774fa0e09ce44d4938bfad4436e231bb396ee38 | |
parent | 2b0c5dc56dd3858300192769c7ead62ddf31662c (diff) |
dgit-repos-server: tag2upload: Better message from upstream mismatch
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | infra/dgit-repos-server | 4 |
1 files changed, 3 insertions, 1 deletions
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"; } |