Merge blacklist PRs manually using merge=union #284
Conversation
|
This closes Charcoal-SE/SmokeDetector#776. |
app/controllers/github_controller.rb
Outdated
| `git checkout master; git pull origin master` | ||
| `git fetch origin #{ref}` | ||
| `git merge origin/#{ref} --no-ff -m 'Merge pull request ##{pr_num} from Charcoal-SE/#{ref} --autopull'` | ||
| `git push origin master` |
There was a problem hiding this comment.
Is there an Octokit equivalent for each of these commands?
There was a problem hiding this comment.
No, sadly. The Github API does not respect the merge=union Git attribute when performing merges (otherwise I could just drop a .gitattributes in the SmokeDetector repo).
|
@ArtOfCode- Is there an |
|
That'll be the email, since it's used to log in |
app/controllers/github_controller.rb
Outdated
|
|
||
| `git checkout master; git pull origin master` | ||
| `git fetch origin #{ref}` | ||
| `git merge origin/#{ref} --no-ff -m 'Merge pull request ##{pr_num} from Charcoal-SE/#{ref} --autopull'` |
There was a problem hiding this comment.
String interpolation here makes me nervous. Is it at all possible to parameterize these in some way? If the GH secret gets out, this could be a direct path to full shell access. Otherwise, looks great.
There was a problem hiding this comment.
I'll change it to a system call (which also won't capture stdout as a bonus)
app/controllers/github_controller.rb
Outdated
| @@ -213,12 +213,32 @@ def pullapprove_merge_hook | |||
| return | |||
| end | |||
|
|
|||
| unless Dir.exist?('SmokeDetector') | |||
| `git clone https://github.com/Charcoal-SE/SmokeDetector` | |||
There was a problem hiding this comment.
We'll want to switch this over to SSH
This prevents the usual merge conflicts created when another blacklist PR is merged first.