GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Explicit push location to ignore user git config by abadger · Pull Request #264 · python/core-workflow

Conversation

@abadger

@abadger abadger commented Jun 16, 2018

Copy link
Copy Markdown
Contributor

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.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@abadger
Explicit push location to ignore user git config
90917bf 
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

the-knights-who-say-ni commented Jun 16, 2018

Copy link
Copy Markdown

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!
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@the-knights-who-say-ni the-knights-who-say-ni added the CLA not signed label Jun 16, 2018
@abadger

abadger commented Jun 16, 2018

Copy link
Copy Markdown
Contributor Author

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.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@abadger abadger mentioned this pull request Jun 16, 2018
🚸 🐍 🍒 ⛏ Integrate cherry picker ansible/ansible#41403
Merged
@Mariatta Mariatta removed the CLA not signed label Jun 16, 2018
@the-knights-who-say-ni the-knights-who-say-ni added the CLA signed label Jun 16, 2018
webknjaz
webknjaz approved these changes Jun 16, 2018
View reviewed changes
Mariatta
Mariatta approved these changes Jun 18, 2018
View reviewed changes
@Mariatta
Mariatta merged commit f8d054d into python:master Jun 18, 2018
@Mariatta

Mariatta commented Jun 18, 2018

Copy link
Copy Markdown
Member

Thanks! 🌮
webknjaz reacted with hooray emoji
All reactions
  • 🎉 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@abadger

abadger commented Jun 18, 2018 via email

Copy link
Copy Markdown
Contributor Author
Thank you :-)
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@abadger
abadger deleted the fix-push-for-user-cfg branch June 19, 2018 15:28
@Mariatta Mariatta mentioned this pull request Aug 3, 2018
Please update the changelog for cherry_picker #279
Closed
@Mariatta Mariatta added the cherry_picker.py label Aug 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@webknjaz webknjaz webknjaz approved these changes
@Mariatta Mariatta Mariatta approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

cherry_picker.py CLA signed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@abadger @the-knights-who-say-ni @Mariatta @webknjaz
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.