From bcf5ba9ea20484ea01960522213048429ad4c10e Mon Sep 17 00:00:00 2001 From: Fuzzwah Date: Wed, 25 Jan 2023 16:26:59 +1100 Subject: [PATCH] get `default_branch` from @payload, use that for the Git.pull fixes #23 --- server.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.rb b/server.rb index 8b9e422..d5ce214 100644 --- a/server.rb +++ b/server.rb @@ -222,6 +222,7 @@ def take_requested_action full_repo_name = @payload['repository']['full_name'] repository = @payload['repository']['name'] head_branch = @payload['check_run']['check_suite']['head_branch'] + default_branch = @payload['repository']['default_branch'] if (@payload['requested_action']['identifier'] == 'fix_rubocop_notices') clone_repository(full_repo_name, repository, head_branch) @@ -257,7 +258,7 @@ def clone_repository(full_repo_name, repository, ref) @git = Git.clone("https://x-access-token:#{@installation_token.to_s}@github.com/#{full_repo_name}.git", repository) pwd = Dir.getwd() Dir.chdir(repository) - @git.pull + @git.pull("https://x-access-token:#{@installation_token.to_s}@github.com/#{full_repo_name}.git", branch=default_branch) @git.checkout(ref) Dir.chdir(pwd) end