Merge pull request #1823 from Tilka/buildbot_try

buildbot-try: allow remotes other than "origin"
This commit is contained in:
Pierre Bourdon 2015-01-04 00:01:11 +01:00
commit 03f716e651
1 changed files with 5 additions and 1 deletions

View File

@ -28,11 +28,15 @@ 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)
remote=$(git remote -v | grep dolphin-emu/dolphin.git | head -n1 | cut -f1)
remote=${remote:-origin}
baserev=$(git merge-base HEAD $remote/master)
echo "Branch name: $branchname"
echo "Change author: $author"
echo "Short rev: $shortrev"
echo "Remote: $remote"
echo "Base rev: $baserev"
git diff --binary -r $baserev | buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev --diff=- -p1 --baserev $baserev $*