From 8229746695752ea8d04e49e7ad73ed16e30eae72 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 3 Jan 2015 17:07:02 +0100 Subject: [PATCH] buildbot-try: allow remotes other than "origin" --- Tools/buildbot-try.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tools/buildbot-try.sh b/Tools/buildbot-try.sh index 8c430eb5fa..ef2903b2e4 100755 --- a/Tools/buildbot-try.sh +++ b/Tools/buildbot-try.sh @@ -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 $*