From 38e258727786a796835fb669f7413f52e207fd07 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 24 Apr 2009 11:43:11 -0400 Subject: git_version: fall back to git-describe w/o --long, and even git-rev-parse HEAD for old gits --- git_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git_version.sh') diff --git a/git_version.sh b/git_version.sh index 92f2bd31..c9d3dff7 100755 --- a/git_version.sh +++ b/git_version.sh @@ -207,7 +207,7 @@ if [ "x$git_repo_dir" != "x" ] && [ "x${abs_repo_dir}" = "x${abs_srcdir}/.git" ] git_repo=yes if [ "x$git_found" = "xyes" ]; then # git-1.4 and probably earlier understand "git-rev-parse HEAD" - git_shaid=`git-describe --long` + git_shaid=`git-describe --long 2>/dev/null || git-describe 2>/dev/null || git-rev-parse HEAD` if [ "x$git_shaid" = "x" ]; then git_errors="${git_errors+${git_errors}; }error running 'git-rev-parse HEAD'" fi -- cgit