diff options
| -rwxr-xr-x | git_version.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |