summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-07-03 08:22:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:00 -0500
commit91e68b1d9034655645271455a61c6047a093d636 (patch)
tree136492460830b23a74f2dc2a61ddba20a0411f39 /source4
parent222c6dd7818c729540079cc480ee56812681854e (diff)
downloadsamba-91e68b1d9034655645271455a61c6047a093d636.tar.gz
samba-91e68b1d9034655645271455a61c6047a093d636.tar.bz2
samba-91e68b1d9034655645271455a61c6047a093d636.zip
r23681: merge 23670 from SAMBA_3_0:
metze (This used to be commit 446312df745160a6ee1bca93143e10927dfb05ce)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/script/mkversion.sh2
1 files changed, 1 insertions, 1 deletions
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