r23681: merge 23670 from SAMBA_3_0:
authorStefan Metzmacher <metze@samba.org>
Tue, 3 Jul 2007 08:22:24 +0000 (08:22 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:59:00 +0000 (14:59 -0500)
metze
(This used to be commit 446312df745160a6ee1bca93143e10927dfb05ce)

source4/script/mkversion.sh

index 4bb0c7b5b05f8b7b51b4e385a0f9097c50d6f128..7c7cb6b40479c1769d2fa5795dca84525e70066a 100755 (executable)
@@ -107,7 +107,7 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
     if test x"${HAVEVER}" != x"yes";then
        HAVEGIT=no
         GIT_INFO=`git show --abbrev-commit HEAD 2>/dev/null`
-       TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' |sed -e 's/commit \([0-9a-f]*\).*/\1/'`
+       TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' | sed 1q |sed -e 's/commit \([0-9a-f]*\).*/\1/'`
        if test -n "$TMP_REVISION";then
            HAVEGIT=yes
             HAVEVER=yes