[svn-commits] sruffell: branch linux/2.4 r9760 - /linux/branches/2.4/build_tools/make_version

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Feb 11 11:52:09 2011
New Revision: 9760

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9760
Log:
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 at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9475

Modified:
    linux/branches/2.4/build_tools/make_version

Modified: linux/branches/2.4/build_tools/make_version
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/build_tools/make_version?view=diff&rev=9760&r1=9759&r2=9760
==============================================================================
--- linux/branches/2.4/build_tools/make_version (original)
+++ linux/branches/2.4/build_tools/make_version Fri Feb 11 11:52:09 2011
@@ -66,7 +66,7 @@
             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