Merge pull request #13 from timn/master

Ensure non-interactive merge
seek-oss · Oct 12, 2018 · 5d37d69 · 5d37d69
2 parents 0389d0b + de04fc7
commit 5d37d69
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/hooks/post-checkout b/hooks/post-checkout
@@ -29,7 +29,10 @@ function merge() {
 
   git fetch -v origin "${target_branch}"
   git checkout FETCH_HEAD
-  GIT_COMMITTER_NAME="github-merged-pr-buildkite-plugin" git merge "${BUILDKITE_COMMIT}"
+  GIT_COMMITTER_EMAIL="auto-merge@buildkite" \
+  GIT_AUTHOR_NAME="github-merged-pr-buildkite-plugin" \
+  GIT_COMMITTER_NAME="github-merged-pr-buildkite-plugin" \
+  git merge --no-edit "${BUILDKITE_COMMIT}"
 }
 
 force_merge="${GITHUB_MERGED_PR_FORCE_BRANCH:-}"