scripts: fix revision calculation using new "main" branch

[M95D]

Fixes revision calculation when local branch is rebased on "main" instead of "master".
https://forum.openwrt.org/t/release-version-appears-as-r0-26304/198446

[KanjiMonster]

Makes sense

[rany2]

Why not just use the ${BRANCH} variable? Nevermind, looks good.

[M95D]

Because the branch may be other than "main", in which case the revision looks like r26281+22-0162174e7e, where 26281 is the main branch and +22 are local commits on the local branch.

[KanjiMonster]

You are missing a signed-off-by though, and the PR description should be in the commit as well.

[M95D]

Right! I always forget that. :-|

[rany2]

@M95D Off topic but I just use this hook:

touch .git/hooks/prepare-commit-msg
chmod +x .git/hooks/prepare-commit-msg

Then paste the following into the file:

#!/bin/sh

NAME=$(git config user.name)
EMAIL=$(git config user.email)

if [ -z "$NAME" ]; then
    echo "empty git config user.name"
    exit 1
fi

if [ -z "$EMAIL" ]; then
    echo "empty git config user.email"
    exit 1
fi

git interpret-trailers --if-exists doNothing --trailer \
    "Signed-off-by: $NAME <$EMAIL>" \
    --in-place "$1"

[M95D]

PS:
Someone should check what branch build bots are using...

[KanjiMonster]

LGTM now