summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-07-01 19:11:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:44 -0500
commit0a754ca75c557ce3fd3893c5505d7bfacb586327 (patch)
tree9e7bc40340f4654e22a242008d2cddcd06237273 /source3
parentb3b83941d8d5947944ba0c6423fabdc4532e0f5f (diff)
downloadsamba-0a754ca75c557ce3fd3893c5505d7bfacb586327.tar.gz
samba-0a754ca75c557ce3fd3893c5505d7bfacb586327.tar.bz2
samba-0a754ca75c557ce3fd3893c5505d7bfacb586327.zip
r23670: Fix mkversion.sh for the git case: Only use the first line where
"commit" occurs (This used to be commit 0e9aeec37008e5b882ce91c44ee201ef779ecabe)
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/script/mkversion.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index cfd6b506d4..e87d5ba72e 100755
--- a/source3/script/mkversion.sh
+++ b/source3/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