diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-04-27 11:56:15 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-04-27 11:56:15 -0400 |
| commit | e84f20287ae21b31c3505dfd0a81176687ad1ec5 (patch) | |
| tree | 956005556406fc93e4444ee0d425aafed8e241d0 /git_version.sh | |
| parent | fb6d28283bd7ea63364a008d32c53687a694642f (diff) | |
| parent | 097e4a5b397b9e826453e01caa1f8169886128c5 (diff) | |
| download | systemtap-steved-e84f20287ae21b31c3505dfd0a81176687ad1ec5.tar.gz systemtap-steved-e84f20287ae21b31c3505dfd0a81176687ad1ec5.tar.xz systemtap-steved-e84f20287ae21b31c3505dfd0a81176687ad1ec5.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
configure
testsuite/configure
Diffstat (limited to 'git_version.sh')
| -rwxr-xr-x | git_version.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git_version.sh b/git_version.sh index d39d96c9..c9d3dff7 100755 --- a/git_version.sh +++ b/git_version.sh @@ -180,7 +180,7 @@ fi # Detect git tools (should work with old and new git versions) git_found=yes -for git_tool in git-symbolic-ref git-rev-parse git-diff-files git-diff-index git +for git_tool in git-symbolic-ref git-rev-parse git-diff-files git-diff-index git git-describe do if [ x`which $git_tool 2>/dev/null` = "x" ]; then git_found="'$git_tool' not found" @@ -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-rev-parse HEAD | $SED -n 's/^\(.\{8\}\).*/\1/p'` + 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 |