Skip to content

Commit e98e3dd

Browse files
committed
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
1 parent 41cced2 commit e98e3dd

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ script: |
7070
done
7171
7272
# Create the release tarball using (arbitrarily) the first host
73+
export GIT_DIR="$PWD/.git"
7374
./autogen.sh
7475
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
7576
make dist

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ script: |
8080
done
8181
8282
# Create the release tarball using (arbitrarily) the first host
83+
export GIT_DIR="$PWD/.git"
8384
./autogen.sh
8485
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
8586
make dist

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ script: |
7373
done
7474
7575
# Create the release tarball using (arbitrarily) the first host
76+
export GIT_DIR="$PWD/.git"
7677
./autogen.sh
7778
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
7879
make dist

share/genbuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fi
1616
DESC=""
1717
SUFFIX=""
1818
LAST_COMMIT_DATE=""
19-
if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
19+
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
2020
# clean 'dirty' status of touched files that haven't been modified
2121
git diff >/dev/null 2>/dev/null
2222

0 commit comments

Comments
 (0)