X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=scripts%2Fsetlocalversion;h=82e4993f0a7368797989b2acd169fe203766fb7a;hb=63ac9b915924d1237d2135fcb4de724e6127ca5e;hp=9a23825218f20135eadd4b348e45de2b21a3d421;hpb=dd49f96777d5a72d5591ac2112d4ac940391774e;p=sfrench%2Fcifs-2.6.git

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 9a23825218f2..82e4993f0a73 100644
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -11,12 +11,12 @@ cd "${1:-.}" || usage
 # Check for git and a git repo.
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	# Do we have an untagged version?
-	if  [ "`git name-rev --tags HEAD`" = "HEAD undefined" ]; then
+	if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
 		printf '%s%s' -g `echo "$head" | cut -c1-8`
 	fi
 
 	# Are there uncommitted changes?
-	if git diff-files | read dummy; then
+	if git diff-index HEAD | read dummy; then
 		printf '%s' -dirty
 	fi
 fi