From 083d6eda834580b8aba4558cf2428ca87c2d232b Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Wed, 15 Nov 2023 12:11:52 +0100 Subject: [PATCH] bump-tag: Compare against current branch Mariah pointed out that this was lost in: https://github.com/SUNET/multiverse/commit/6ac9294dea377245ce6947e053da753a9a3b9ba7 And should be reinstated --- bump-tag | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bump-tag b/bump-tag index 0f85866..d14dcaa 100755 --- a/bump-tag +++ b/bump-tag @@ -25,7 +25,8 @@ if [[ -n ${last_tag} ]]; then echo "" echo "Differences between tag ${last_tag} and what you are about to sign:" - env PAGER=cat git diff --color "${last_tag}..main" + this_branch=$(git rev-parse --abbrev-ref HEAD) + env PAGER=cat git diff --color "${last_tag}..${this_branch}" iter=1 ok=