From e98e3dde6a976a2c8f266ee963d6931fd4b37262 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Fri, 12 Feb 2016 05:36:55 +0000 Subject: Bugfix: Only use git for build info if the repository is actually the right one Also adds ability to disable check with BITCOIN_GENBUILD_NO_GIT=1 in the environment --- share/genbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/genbuild.sh b/share/genbuild.sh index ffa89ca6e4..4965ef14cd 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -16,7 +16,7 @@ fi DESC="" SUFFIX="" LAST_COMMIT_DATE="" -if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then +if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" -a "$(git status --porcelain -u no --ignored "$0" | cut -b1)" != "?" ]; then # clean 'dirty' status of touched files that haven't been modified git diff >/dev/null 2>/dev/null -- cgit v1.2.3 From ed1fcdcac0b9388b4e50f5e4ca2d5cd963f1ef27 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 29 Dec 2016 15:24:38 +0000 Subject: Bugfix: Detect genbuild.sh in repo correctly --- share/genbuild.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/genbuild.sh b/share/genbuild.sh index 2a7c5c888f..7db5455f63 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -13,9 +13,13 @@ else exit 1 fi +git_check_in_repo() { + ! { git status --porcelain -uall --ignored "$@" 2>/dev/null || echo '??'; } | grep -q '?' +} + DESC="" SUFFIX="" -if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" -a "$(git status --porcelain -u no --ignored "$0" | cut -b1)" != "?" ]; then +if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then # clean 'dirty' status of touched files that haven't been modified git diff >/dev/null 2>/dev/null -- cgit v1.2.3