From e7011280c7796e437ba34ed97033b120b8556043 Mon Sep 17 00:00:00 2001 From: Amber Brown Date: Thu, 29 Aug 2019 22:19:57 +1000 Subject: Fix coverage in sytest and use plugins for buildkite (#5922) --- .buildkite/merge_base_branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.buildkite/merge_base_branch.sh') diff --git a/.buildkite/merge_base_branch.sh b/.buildkite/merge_base_branch.sh index 26176d6465..eb7219a56d 100755 --- a/.buildkite/merge_base_branch.sh +++ b/.buildkite/merge_base_branch.sh @@ -27,7 +27,7 @@ git config --global user.name "A robot" # Fetch and merge. If it doesn't work, it will raise due to set -e. git fetch -u origin $GITBASE -git merge --no-edit origin/$GITBASE +git merge --no-edit --no-commit origin/$GITBASE # Show what we are after. git --no-pager show -s -- cgit 1.4.1