New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doctor: Check for branch of core tap (take 2) #3229

Merged
merged 7 commits into from Oct 18, 2017

Conversation

Projects
None yet
3 participants
@BenMusch
Contributor

BenMusch commented Sep 27, 2017

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew tests with your changes locally?

Fixes the issues with #3089 -- the git_head returns a commit sha.

Pulls the changes from #3094 without the refactor to GitClient, to get the easy win merged first

@BenMusch BenMusch referenced this pull request Sep 27, 2017

Closed

doctor: Check for branch of core tap #3094

5 of 5 tasks complete
return if ENV["CI"] || ENV["JENKINS_HOME"]
branch = coretap_path.git_branch
return if branch.nil? || branch =~ /master/

This comment has been minimized.

@MikeMcQuaid

MikeMcQuaid Sep 28, 2017

Member

Should probably be return if branch != "master" as foo-master-bar is an invalid branch name.

@MikeMcQuaid

MikeMcQuaid Sep 28, 2017

Member

Should probably be return if branch != "master" as foo-master-bar is an invalid branch name.

@@ -36,6 +36,15 @@ def git_last_commit
end
end
def git_branch
return unless git? && Utils.git_available?

This comment has been minimized.

@MikeMcQuaid

MikeMcQuaid Sep 28, 2017

Member

Make this an if or two statements as unless && is hard to follow.

@MikeMcQuaid

MikeMcQuaid Sep 28, 2017

Member

Make this an if or two statements as unless && is hard to follow.

@MikeMcQuaid

This comment has been minimized.

Show comment
Hide comment
@MikeMcQuaid

MikeMcQuaid Sep 28, 2017

Member

I fixed a brew style CI failure for you.

Member

MikeMcQuaid commented Sep 28, 2017

I fixed a brew style CI failure for you.

@MikeMcQuaid MikeMcQuaid merged commit 3a606ab into Homebrew:master Oct 18, 2017

2 of 3 checks passed

codecov/patch 18.18% of diff hit (target 67.08%)
Details
codecov/project 67.11% (+0.03%) compared to cb139ca
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@MikeMcQuaid

This comment has been minimized.

Show comment
Hide comment
@MikeMcQuaid
Member

MikeMcQuaid commented Oct 18, 2017

Thanks @BenMusch!

@BenMusch

This comment has been minimized.

Show comment
Hide comment
@BenMusch

BenMusch Oct 18, 2017

Contributor

No problem! Sorry for not being super responsive, but I'm still happy to fix any bugs about this if they pop up

Contributor

BenMusch commented Oct 18, 2017

No problem! Sorry for not being super responsive, but I'm still happy to fix any bugs about this if they pop up

@BenMusch BenMusch deleted the BenMusch:check-for-master-no-refactor branch Oct 18, 2017

@Homebrew Homebrew locked and limited conversation to collaborators May 4, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.