From 91e68b1d9034655645271455a61c6047a093d636 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 3 Jul 2007 08:22:24 +0000 Subject: r23681: merge 23670 from SAMBA_3_0: metze (This used to be commit 446312df745160a6ee1bca93143e10927dfb05ce) --- source4/script/mkversion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh index 4bb0c7b5b0..7c7cb6b404 100755 --- a/source4/script/mkversion.sh +++ b/source4/script/mkversion.sh @@ -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 -- cgit