[PATCH] GIT-VERSION-GEN: support non-standard $GIT_DIR path
- From
Dennis Kaarsemaker <dennis@kaarsemaker.net>
- Date
- Jun 15, 2013, 23:01 UTC
- Message-ID
- <20130615230108.GA21005@kaarsemaker.net>
make and make test both work when $GIT_DIR isn't .git, but make dist included a bogus GIT-VERSION-FILE.
Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> --- I'm doing daily builds of git, using many workers and a shared git.git, with per-worker checkouts, it would be really useful if GIT-VERSION-GEN actually supports this and doesn't generate a fairly bogus GIT-VERSION-FILE.
GIT-VERSION-GEN | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 390782f..7dcca28 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -11,7 +11,7 @@ LF=' if test -f version then VN=$(cat version) || VN="$DEF_VER" -elif test -d .git -o -f .git && +elif test -d .git -o -f .git -o test -d $GIT_DIR && VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;;
-- 1.8.2.4.g940421e