From 9d87b8b3c8037e100c3b8a81a12eaab5cdc7725b Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 31 Jan 2014 07:45:11 +0100 Subject: [PATCH] buildbot: find base revision and generate diff explicit --- Tools/buildbot-try.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tools/buildbot-try.sh b/Tools/buildbot-try.sh index e71e92b61a..b34db15aef 100755 --- a/Tools/buildbot-try.sh +++ b/Tools/buildbot-try.sh @@ -28,8 +28,11 @@ 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) + echo "Branch name: $branchname" echo "Change author: $author" echo "Short rev: $shortrev" +echo "Base rev: $baserev" -buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev $* +git diff -r $baserev | buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev --diff=- -p1 --baserev $baserev $*