X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;ds=sidebyside;f=fs%2Fbtrfs%2Fversion.sh;h=1ca1952fd917efac9978d6596343e74f6cc05cec;hb=76a67ec6fb79ff3570dcb5342142c16098299911;hp=fd9b53d398602fac7bdea67597b5843b5f544d63;hpb=b3c3da71ed88c06bc18a4d8919c6e4af3b933566;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/btrfs/version.sh b/fs/btrfs/version.sh
index fd9b53d..1ca1952 100644
--- a/fs/btrfs/version.sh
+++ b/fs/btrfs/version.sh
@@ -6,26 +6,26 @@
 # Copyright 2008, Oracle
 # Released under the GNU GPLv2
  
-v="Btrfs v0.15"
+v="v0.16"
 
-which hg > /dev/null
+which git &> /dev/null
 if [ $? == 0 ]; then
-	last=$(hg tags | grep -m1 -o '^v[0-9.]\+')
-	 
-	# now check if the repo has commits since then...
-	if [[ $(hg id -t) == $last || \
-	    $(hg di -r "$last:." | awk '/^diff/{print $NF}' | sort -u) == .hgtags ]]
-	then
-	    # check if it's dirty
-	    if [[ $(hg id | cut -d' ' -f1) == *+ ]]; then
-		v=$last+
-	    else
-		v=$last
+    git branch >& /dev/null
+    if [ $? == 0 ]; then
+	    if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+		if tag=`git describe --tags 2>/dev/null`; then
+		    v="$tag"
+		fi
+
+		# Are there uncommitted changes?
+		git update-index --refresh --unmerged > /dev/null
+		if git diff-index --name-only HEAD | \
+		    grep -v "^scripts/package" \
+		    | read dummy; then
+		    v="$v"-dirty
+		fi
 	    fi
-	else
-	    # includes dirty flag
-	    v=$last+$(hg id -i)
-	fi
+    fi
 fi
  
 echo "#ifndef __BUILD_VERSION" > .build-version.h