From 0a754ca75c557ce3fd3893c5505d7bfacb586327 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 1 Jul 2007 19:11:40 +0000 Subject: r23670: Fix mkversion.sh for the git case: Only use the first line where "commit" occurs (This used to be commit 0e9aeec37008e5b882ce91c44ee201ef779ecabe) --- source3/script/mkversion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3') 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 -- cgit