1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 47e75b69a2e9..32c8554f3946 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -10,13 +10,12 @@ cd "${1:-.}" || usage
 # Check for git and a git repo.
 if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
-        # Do we have an untagged version?
+        # Do we have an untagged tag?
-        if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
+        if atag=`git describe 2>/dev/null`; then
-                if tag=`git describe 2>/dev/null`; then
+                echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
-                        echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+        # add -g${head}, if there is no usable tag
-                else
+        else
-                        printf '%s%s' -g $head
+                printf '%s%s' -g $head
-                fi
        fi
        # Is this git on svn?

diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 47e75b69a2e9..32c8554f3946 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion
@@ -10,13 +10,12 @@ cd "${1:-.}" \|\| usage
10		10
11	# Check for git and a git repo.	11	# Check for git and a git repo.
12	if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then	12	if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
13	# Do we have an untagged version?	13	# Do we have an untagged tag?
14	if git name-rev --tags HEAD \| grep -E '^HEAD[[:space:]]+(.~[0-9]\|undefined)$' > /dev/null; then	14	if atag=`git describe 2>/dev/null`; then
15	if tag=`git describe 2>/dev/null`; then	15	echo "$atag" \| awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
16	echo $tag \| awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'	16	# add -g${head}, if there is no usable tag
17	else	17	else
18	printf '%s%s' -g $head	18	printf '%s%s' -g $head
19	fi
20	fi	19	fi
21		20
22	# Is this git on svn?	21	# Is this git on svn?