deploy-branch: Check out original ref by name if possible

(imported from commit eefc68574f1d1a94f1284670df18f59ef2aa1aa5)

tools/deploy-branch

@@ -18,9 +18,14 @@ branch_ref=$(git rev-list --max-count=1 $branch)
 
 if [ "$old_ref" == "$branch_ref" ]; then
     new_ref=master
+else
+    ref_name=$(git describe --all --exact $old_ref)
+    if [ $? -eq 0 ]; then
+        new_ref=$(echo $ref_name | perl -pe 's{^(heads|remotes)/}{}')
     else
         new_ref=$old_ref
     fi
+fi
 
 [ -z "$branch" ] && error_out "You must specify a branch name to deploy"