X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fbuild_tools%2Fautorevision.sh;h=9e31cd1f54cb47efcb05de22c77eea32197094ef;hb=f6235817a7a2b5a66539c494454daf2af04b2a4b;hp=2ccdb013ab6a8585d13aeb955972d4242b94e1fc;hpb=d240a32754a4dea85ac6321527e3110671e2e1ec;p=synfig.git

diff --git a/synfig-core/trunk/build_tools/autorevision.sh b/synfig-core/trunk/build_tools/autorevision.sh
index 2ccdb01..9e31cd1 100644
--- a/synfig-core/trunk/build_tools/autorevision.sh
+++ b/synfig-core/trunk/build_tools/autorevision.sh
@@ -16,7 +16,14 @@
 get_git_id(){
 	export SCM=git
 	export REVISION=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' '`
-	export BRANCH=`cd "$1"; git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
+	BRANCH=`cd "$1"; git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch\)//`
+	if ( echo $BRANCH | egrep origin/master > /dev/null ); then
+		#give a priority to master branch
+		BRANCH='master'
+	else
+		BRANCH=`echo $BRANCH | cut -d ' ' -f 1`
+		BRANCH=${BRANCH#*/}
+	fi
 	export DATE=`git-show --pretty=format:%ci HEAD |  head -c 10`
 	DATE=${DATE:0:4}${DATE:5:2}${DATE:8:2}
 	export COMPARE="$1/.git/"