summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2011-02-11 17:52:09 +0000
committerShaun Ruffell <sruffell@digium.com>2011-02-11 17:52:09 +0000
commit2ea6804637376a21ac9021058e4293029155d2ff (patch)
tree056425a30f68505e5fec1bdfec74b7f0c19aed21
parente54893b9461b4777dcf3dcd6f0bc74ca43c8c850 (diff)
make_version: Use 'git rev-parse' if only looking for a sha5.
Different versions of git have variability in how the log output looks. Instead of git log, we can use git rev-parse directly. Signed-off-by: Shaun Ruffell <sruffell@digium.com> Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9475 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9760 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rwxr-xr-xbuild_tools/make_version2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_tools/make_version b/build_tools/make_version
index 488fc8c..b9bb29f 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -66,7 +66,7 @@ elif [ -d ${1}/.git ]; then
fi
# Some older versions of git do not support all the above
# options.
- VERSION=GIT-`git log --abbrev-commit -1 --pretty=oneline --abbrev=7 | cut -f 1 -d .`${MODIFIED}
+ VERSION=GIT-`git rev-parse --short --verify HEAD`${MODIFIED}
fi
echo ${VERSION}
else