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

Explicit push location to ignore user git config #264

Merged
merged 1 commit into from Jun 18, 2018

Conversation

abadger
Copy link
Contributor

@abadger abadger commented Jun 16, 2018

Users can configure what strategy "git push" uses to determine which
remote branch it should push to. Cherry-picker doesn't work with all of
the git push strategies but we can make explicit what the remote branch
should be which works around that problem.

In my case, I had this in my .gitconfig (perhaps needed long ago when git used a less intuitive push strategy by default:

[push]
        default = tracking

That caused git to push to the remote that the branch was branched from rather than trying to push to a branch with the same name as the existing, local one. Being explicit about both the local and remote branchname should just make the behaviour cherry_picker expects work in both default git configurations and customzed configurations.

Users can configure what strategy "git push" uses to determine which
remote branch it should push to.  Cherry-picker doesn't work with all of
the git push strategies but we can make explicit what the remote branch
should be which works around that problem.
@abadger abadger requested a review from Mariatta as a code owner June 16, 2018 19:45
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

When your account is ready, please add a comment in this pull request
and a Python core developer will remove the CLA not signed label
to make the bot check again.

Thanks again for your contribution, we look forward to reviewing it!

@abadger
Copy link
Contributor Author

abadger commented Jun 16, 2018

Okay, github nick associated with my bugs.python.org account (Contributor Form: Yes on: 2011-03-15.21:00:00) So this should be ready for the bot to check again.

@Mariatta Mariatta merged commit f8d054d into python:master Jun 18, 2018
@Mariatta
Copy link
Member

Thanks! 🌮

@abadger
Copy link
Contributor Author

abadger commented Jun 18, 2018 via email

@abadger abadger deleted the fix-push-for-user-cfg branch June 19, 2018 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants