Skip to content

Commit

Permalink
Fix git version to build version
Browse files Browse the repository at this point in the history
  • Loading branch information
sieniven committed Nov 23, 2023
1 parent d4dbe0a commit e8cb60b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions contrib/genbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ git_check_in_repo() {
DESC=""
SUFFIX=""
CURRENT_BRANCH=""
if [ -z "$GIT_VERSION" ] && [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo contrib/genbuild.sh; then
if [ -z "$BUILD_VERSION" ] && [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo contrib/genbuild.sh; then
# clean 'dirty' status of touched files that haven't been modified
git diff >/dev/null 2>/dev/null

Expand Down Expand Up @@ -55,8 +55,8 @@ if [ -z "$GIT_VERSION" ] && [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(c
git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
fi

if [ -z "$GIT_VERSION" ]; then
NEWINFO="#define BUILD_DESC \"$GIT_VERSION\""
if [ -z "$BUILD_VERSION" ]; then
NEWINFO="#define BUILD_DESC \"$BUILD_VERSION\""
elif [ -n "$DESC" ]; then
NEWINFO="#define BUILD_DESC \"$DESC\""
elif [ -n "$SUFFIX" ]; then
Expand Down

0 comments on commit e8cb60b

Please sign in to comment.