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.

Sign up for GitHub

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

Jump to bottom

Add optional parameter to point to different parent branch #113

Merged
merged 10 commits into from
Dec 10, 2020
Merged

Add optional parameter to point to different parent branch #113

merged 10 commits into from
Dec 10, 2020

Conversation

pschroeder89
Copy link
Collaborator

@pschroeder89 pschroeder89 commented Nov 6, 2020 •
edited
Loading

In the event a repo is not using "master" as its parent branch, Branch mode currently fails. This PR allows the use of a parameter (--parent-branch main, --parent-branch trunk, --parent-branch develop, etc.) to specify a repository's parent branch name.
If no parent-branch option is supplied, the default is master.

@pschroeder89 pschroeder89 changed the base branch from master to dev November 6, 2020 19:25
@anapaulagomes
Copy link
Owner

Nice one, @pschroeder89! ✨
Could you please add a test for it? Also, an entry on our CHANGELOG.md would be awesome. Thanks!

@pschroeder89
Copy link
Collaborator Author

Nice one, @pschroeder89! ✨
Could you please add a test for it? Also, an entry on our CHANGELOG.md would be awesome. Thanks!

Done and done!

@anapaulagomes
Copy link
Owner

Hi @pschroeder89! I'll look it again next week.

anapaulagomes
anapaulagomes requested changes Dec 9, 2020
View reviewed changes
Copy link
Owner

@anapaulagomes anapaulagomes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there. I tested locally and works fine. Well done! I'm only missing a test in test_pytest_picked.py (where we'll have faster feedback in case we break something in the future). Once this is done we're ready to go.

tests/test_modes.py Show resolved Hide resolved
@anapaulagomes anapaulagomes self-requested a review December 10, 2020 00:31
anapaulagomes
anapaulagomes approved these changes Dec 10, 2020
View reviewed changes
Copy link
Owner

@anapaulagomes anapaulagomes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@anapaulagomes anapaulagomes merged commit ad4c1b2 into anapaulagomes:dev Dec 10, 2020
@anapaulagomes anapaulagomes mentioned this pull request Dec 10, 2020
Closed
anapaulagomes added a commit that referenced this pull request Dec 22, 2020
@anapaulagomes
Bump to 0.4.6 (#116)
4d4a8d0 
* Adopt Github Actions (#97)

* Update badges

* Create FUNDING.yml

* Add optional parameter to point to different parent branch (#113)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anapaulagomes anapaulagomes anapaulagomes approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pschroeder89 @anapaulagomes