From 880ee94a94684b860fd330a2e97eadb3aaab4897 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 4 May 2016 15:41:32 -0400 Subject: [PATCH] Fix for version.sh when libvpx is checked out as git submodule When using git submodules, .git may be a file instead of a directory. The -d test was failing in that case; switched to -e. BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1215 Change-Id: Iedf0e92bfeb003b28a415945dc729e6ce58c4fe4 --- build/make/version.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/make/version.sh b/build/make/version.sh index b340142c9..696752777 100755 --- a/build/make/version.sh +++ b/build/make/version.sh @@ -24,8 +24,9 @@ out_file=${2} id=${3:-VERSION_STRING} git_version_id="" -if [ -d "${source_path}/.git" ]; then +if [ -e "${source_path}/.git" ]; then # Source Path is a git working copy. Check for local modifications. + # Note that git submodules may have a file as .git, not a directory. export GIT_DIR="${source_path}/.git" git_version_id=`git describe --match=v[0-9]* 2>/dev/null` fi