X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=scripts%2Fsetlocalversion;h=47e75b69a2e974b77e22da05d2a2a3b31655f1a8;hb=b8fd47aefa5f13df1edacbc7e68d9874635109e5;hp=81d984b91594de4c69122f3b1d30d5e7bf133ccb;hpb=167d6a02c1dbdd84d49e87df7718f18fa31cb971;p=safe%2Fjmp%2Flinux-2.6

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 81d984b..47e75b6 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -19,6 +19,11 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
 		fi
 	fi
 
+	# Is this git on svn?
+	if git config --get svn-remote.svn.url >/dev/null; then
+	        printf -- '-svn%s' "`git svn find-rev $head`"
+	fi
+
 	# Are there uncommitted changes?
 	git update-index --refresh --unmerged > /dev/null
 	if git diff-index --name-only HEAD | grep -v "^scripts/package" \
@@ -53,14 +58,7 @@ fi
 # Check for svn and a svn repo.
 if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then
 	rev=`echo $rev | awk '{print $NF}'`
-	changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l`
-
-	# Are there uncommitted changes?
-	if [ $changes != 0 ]; then
-		printf -- '-svn%s%s' "$rev" -dirty
-	else
-		printf -- '-svn%s' "$rev"
-	fi
+	printf -- '-svn%s' "$rev"
 
 	# All done with svn
 	exit