Merge pull request #22047 from ncopa/fix-build-from-tarball

Fix detection of git commit during build from tarball
2016-04-14 10:42:45 -07:00 · 2016-04-14 10:42:45 -07:00 · 6472a6d9e5
parent 51be6c4f18 355ad33087
commit 6472a6d9e5
1 changed files with 1 additions and 1 deletions
--- a/hack/make.sh
+++ b/hack/make.sh
@ -79,7 +79,7 @@ DEFAULT_BUNDLES=(
 )

 VERSION=$(< ./VERSION)
-if command -v git &> /dev/null && git rev-parse &> /dev/null; then
+if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; then
 	GITCOMMIT=$(git rev-parse --short HEAD)
 	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
 		GITCOMMIT="$GITCOMMIT-unsupported"