From 314a07e787eac88486e5b3b5ed48aa37ae7cddfd Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 6 Feb 2013 21:23:35 +0100 Subject: version.sh: fix git rev. generation (.git is not always a directory) It appears git submodule handling recently changed, changing the .git directory to a regular file containing submodule specific information. This means that version.sh would generate "#define VERSION "git-UNKNOWN"" if the checkout is a submodule, because it explicitly checks for a .git directory using test -d. Change it to -e so that this case is handled correctly. --- version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'version.sh') diff --git a/version.sh b/version.sh index a907dd26ad..90a08ac10e 100755 --- a/version.sh +++ b/version.sh @@ -7,7 +7,7 @@ test "$1" && extra="-$1" # Extract revision number from file used by daily tarball snapshots # or from "git describe" output git_revision=$(cat snapshot_version 2> /dev/null) -test $git_revision || test ! -d .git || git_revision=`git rev-parse --short HEAD` +test $git_revision || test ! -e .git || git_revision=`git rev-parse --short HEAD` git_revision=$(expr "$git_revision" : v*'\(.*\)') test $git_revision || git_revision=UNKNOWN -- cgit v1.2.3