-potential=" "
-for branch in ${contains[@]} ; do
- branch=${branch##origin/}
- #echo "branch=$branch"
-
- # Walk back until we hit a baserev that is not the branch_tip itself (because it was merged)
- branch_tip=$(git rev-parse origin/$branch)
- stable_rev=$(git rev-parse origin/stable)
- stable_base=$(git merge-base "$branch_tip" "$stable_rev")
-
- # echo "stable_base=$stable_base"
- while [ "$stable_base" == "$branch_tip" ] ; do
- stable_rev=$(git rev-parse "${stable_rev}^")
- stable_base=$(git merge-base "$branch_tip" "$stable_rev")
- done
- # echo "stable_base=$stable_base"
-
- git rev-list --first-parent $stable_base..$branch_tip | grep --quiet "$head"
- if [ $? -eq 0 ] ; then
- if [ "$branch" == "stable" ] ; then
- describe=$(git describe $head 2>/dev/null)
- if [ $? -eq 0 ] ; then
- potential="$potential $describe"
- else
- potential="$potential stable-$head"
- fi
- else
- number=$(git rev-list --first-parent "$stable_base..$head" | wc -l)
- potential="$potential $branch-$number"
- fi
- fi
-done
-
-potential=($potential)
-if [ ${#potential[@]} -eq 1 ] ; then
- echo "${potential[0]}"
-else
- echo "unknown"
-fi
+describe=$(git describe --tags --always HEAD)
+case "$describe" in
+ r/*)
+ describe=${describe##r\/}
+ echo "$branch_name-$describe"
+ ;;
+ *)
+ echo "No commit number tag found"
+ exit 1
+ ;;
+esac