summaryrefslogtreecommitdiffstats
path: root/git_version.sh
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2009-04-23 14:43:00 -0400
committerFrank Ch. Eigler <fche@elastic.org>2009-04-23 14:43:00 -0400
commitc0dac6989f733db67f9c4d62b584944efd0680c5 (patch)
tree8401a66aca8e218c6b567cb3556df22d17b56300 /git_version.sh
parent819ec23db74427d0249596959c938673f424f831 (diff)
downloadsystemtap-steved-c0dac6989f733db67f9c4d62b584944efd0680c5.tar.gz
systemtap-steved-c0dac6989f733db67f9c4d62b584944efd0680c5.tar.xz
systemtap-steved-c0dac6989f733db67f9c4d62b584944efd0680c5.zip
git_version: emit `git-describe` rather than just sha code, for use in stap -V
Diffstat (limited to 'git_version.sh')
-rwxr-xr-xgit_version.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git_version.sh b/git_version.sh
index d39d96c9..d7945d71 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`
if [ "x$git_shaid" = "x" ]; then
git_errors="${git_errors+${git_errors}; }error running 'git-rev-parse HEAD'"
fi