Skip to content
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

Git: try to switch to branch master when no branch has been specified. #129

Merged
merged 2 commits into from
Jan 5, 2015

Conversation

mauritsvanrees
Copy link
Collaborator

Do not give an error in this case when master is not there.

Fixes issue #125

Note: lots of tests are failing, so I or you should fix this before merging, but I am off to dinner now. :-) I just wanted to have it out there.

Do not give an error in this case when master is not there.

Fixes issue fschulze#125
@mauritsvanrees
Copy link
Collaborator Author

Acutally, apparently something was wrong in my environment which tripped up the tests. I cleaned up and tried again and they pass. Travis agrees, as you can see above.

@do3cc
Copy link
Contributor

do3cc commented Jan 5, 2015

This would be really useful, is there something that blocks this merge?

fschulze added a commit that referenced this pull request Jan 5, 2015
Git: try to switch to branch master when no branch has been specified.
@fschulze fschulze merged commit b76e77f into fschulze:master Jan 5, 2015
@jensens
Copy link

jensens commented Jan 28, 2015

Looks like the changelog line was sorted into the wrong section in HISTORY.txt (1.27 release not, 1.32 unreleased).

@do3cc
Copy link
Contributor

do3cc commented Jan 28, 2015

Weird, iirc github said this was clean to merge.

fschulze added a commit that referenced this pull request Jan 28, 2015
Fix history from bad merge of PR #129
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants