diff options
author | Johan Lundberg <lundberg@nordu.net> | 2014-12-18 15:49:13 +0100 |
---|---|---|
committer | Johan Lundberg <lundberg@nordu.net> | 2014-12-18 15:49:13 +0100 |
commit | e4931211711de8f25fb85ef2863bd9649ef40808 (patch) | |
tree | c636433a997de0b2e3b4dd43c3d237597d9b569c | |
parent | 7ea62216c5dcf5921e4df3b270c3f4166963caf9 (diff) |
Merged nice bump-tag features from eduid-ops.sunet-ops-2014-12-18-v03
-rwxr-xr-x | bump-tag | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -4,13 +4,22 @@ set -e test -f cosmos.conf && . ./cosmos.conf +echo "Fetching any updates from server:" +git pull +echo "" + deftag=`basename $PWD` tagpfx=${tag:="$deftag"} last_tag=`git tag -l "${tagpfx}-*"|sort|tail -1` -git tag -v $last_tag +echo "Verifying last tag $last_tag:" +(git tag -v $last_tag | grep ^gpg:) || true +# again to not mask exit status of git with grep +git tag -v $last_tag > /dev/null 2>&1 +echo "" +echo "Differences between tag $last_tag and what you are about to sign:" PAGER=cat git diff $last_tag..master iter=1 @@ -27,7 +36,8 @@ while test -z "$ok"; do esac done -echo using new tag $this_tag +echo "" +echo "Using new tag $this_tag" echo ONLY SIGN IF YOU APPROVE OF VERIFICATION AND DIFF ABOVE # GITTAGEXTRA is for putting things like "-u 2117364A" |