From c0dac6989f733db67f9c4d62b584944efd0680c5 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Thu, 23 Apr 2009 14:43:00 -0400
Subject: git_version: emit `git-describe` rather than just sha code, for use
 in stap -V

---
 git_version.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'git_version.sh')

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
-- 
cgit 


From 5171b04f699dd8a2d08c0f1d6307094f2e3c273b Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Thu, 23 Apr 2009 16:30:29 -0400
Subject: git_version: use --long mode to always add the git hash too

---
 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 d7945d71..92f2bd31 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`
+        git_shaid=`git-describe --long`
         if [ "x$git_shaid" = "x" ]; then
             git_errors="${git_errors+${git_errors}; }error running 'git-rev-parse HEAD'"
         fi
-- 
cgit 


From 38e258727786a796835fb669f7413f52e207fd07 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
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