about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabien C <t74jgwb88tli9ch@jetable.org>2014-02-01 16:07:46 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2014-02-05 15:09:15 +0100
commite8cacb5981039e7e74921659ea50e287395ed411 (patch)
tree51130f6d8c9fe9c84af0dcb854ed0524a5cdc865
parentsimple-authentication: style (diff)
downloadcgit-pink-e8cacb5981039e7e74921659ea50e287395ed411.tar.gz
cgit-pink-e8cacb5981039e7e74921659ea50e287395ed411.zip
gen-version.sh: check if git is available before trying to call it
Some people may clone the cgit repository and compile within a sandbox
or on another machine where git is not necessarily installed. When it
happens, cgit is getting compiled with an empty version number.

This commit fixes this.
-rwxr-xr-xgen-version.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/gen-version.sh b/gen-version.sh
index 3a08015..80cf49a 100755
--- a/gen-version.sh
+++ b/gen-version.sh
@@ -4,7 +4,7 @@
 V=$1
 
 # Use `git describe` to get current version if we're inside a git repo
-if test -d .git
+if test "$(git rev-parse --git-dir 2>/dev/null)" = '.git'
 then
 	V=$(git describe --abbrev=4 HEAD 2>/dev/null)
 fi