diff --git a/Tools/buildbot-try.sh b/Tools/buildbot-try.sh index e71e92b..7f749bf 100755 --- a/Tools/buildbot-try.sh +++ b/Tools/buildbot-try.sh @@ -28,8 +28,16 @@ shortrev=$(git describe --always --long --dirty=+ | sed 's/-g[0-9a-f]*\(+*\)$/\1 author=$(grep try_username "$opt_file" | cut -d "'" -f 2) +baserev=$(git merge-base HEAD origin/master) + +current_head=$(git rev-parse HEAD) + echo "Branch name: $branchname" echo "Change author: $author" echo "Short rev: $shortrev" +echo "Base rev: $baserev" +# --baserev seems not to work, so we have to reset --soft to update our head +git reset --soft $baserev buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev $* +git reset --soft $current_head