Author: metze Date: 2007-07-03 08:22:24 +0000 (Tue, 03 Jul 2007) New Revision: 23681
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23681 Log: merge 23670 from SAMBA_3_0: metze Modified: branches/SAMBA_4_0/source/script/mkversion.sh Changeset: Modified: branches/SAMBA_4_0/source/script/mkversion.sh =================================================================== --- branches/SAMBA_4_0/source/script/mkversion.sh 2007-07-03 08:05:55 UTC (rev 23680) +++ branches/SAMBA_4_0/source/script/mkversion.sh 2007-07-03 08:22:24 UTC (rev 23681) @@ -107,7 +107,7 @@ 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
