From fc73d218b2c9a829e240ce42c1814df108582ced Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 16 Jun 2020 12:40:24 +0200 Subject: get-version: Fallback to commit hash if git describe fails --- get-version.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'get-version.sh') diff --git a/get-version.sh b/get-version.sh index 5e5b3e1..49c7024 100755 --- a/get-version.sh +++ b/get-version.sh @@ -9,7 +9,9 @@ cd "$ROOT_DIR" if [ -d .git ]; then [ -n "$(git diff HEAD)" ] && MODDED='+MOD' - echo $(git describe)$MODDED, branch $(git rev-parse --abbrev-ref HEAD), built "$(date +%Y-%m-%d)" + name="$( git describe )" + [ -z "$name" ] && name="$( git rev-parse --short HEAD )" + printf "%s\n" "$name$MODDED, branch $(git rev-parse --abbrev-ref HEAD), built $(date +%Y-%m-%d)" exit 0 fi -- cgit v1.2.3-55-g7522