gbp_retag_commit.sh: get related blocks of code closer one another

[debian/scripts.git] / gbp_retag_commit.sh

diff --git a/gbp_retag_commit.sh b/gbp_retag_commit.sh
index 371cecb..e2a095b 100755 (executable)
--- a/gbp_retag_commit.sh
+++ b/gbp_retag_commit.sh
@@ -17,11 +17,8 @@ usage() {
 }
 
 HASH="$1"
-
 git cat-file -e "${HASH}^{commit}" || { usage 1>&2; exit 1; }
 
-BRANCH_NAME="$(git rev-parse --abbrev-ref HEAD)"
-
 CHANGELOG_HEADER="$(git show $HASH:debian/changelog | head -1)"
 
 # TODO: give a warning or an error if this is is an UNRELEASED version?
@@ -29,7 +26,8 @@ CHANGELOG_HEADER="$(git show $HASH:debian/changelog | head -1)"
 PACKAGE=$(echo "$CHANGELOG_HEADER" | cut -d ' ' -f 1)
 VERSION=$(echo "$CHANGELOG_HEADER" | cut -d '(' -f 2 | cut -d ')' -f 1 )
 
-TAG="$BRANCH_NAME/$VERSION"
+# Use the same default values of gbp-buildpackage
+TAG="debian/$VERSION"
 TAG_MESSAGE="$PACKAGE Debian release $VERSION"
 
 # TODO: maybe drop the older $TAG if it exists?