diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash index f9b541b510b8ec..2f8617ae9f4798 100644 --- a/contrib/guix/libexec/prelude.bash +++ b/contrib/guix/libexec/prelude.bash @@ -65,6 +65,11 @@ time-machine() { # Set common variables ################ +echo "DEBUG: git_head_version: '$(git_head_version)'" +echo "DEBUG: PWD: '${PWD}'" +git tag +git describe --abbrev=12 --dirty --debug + VERSION="${FORCE_VERSION:-$(git_head_version)}" DISTNAME="${DISTNAME:-dashcore-${VERSION}}" diff --git a/contrib/shell/git-utils.bash b/contrib/shell/git-utils.bash index 1371c3df70c0f6..a058cca476c628 100644 --- a/contrib/shell/git-utils.bash +++ b/contrib/shell/git-utils.bash @@ -5,6 +5,7 @@ git_root() { } git_head_version() { + local recent_tag recent_tag="$(git describe --abbrev=12 --dirty 2> /dev/null)" echo "${recent_tag#v}" }