Re: [core-workflow] instructions for cherrypicking a change from master

2016-10-07 Thread Nick Coghlan
On 7 October 2016 at 13:26, Zachary Ware wrote: > On Thu, Oct 6, 2016 at 10:10 PM, Nick Coghlan wrote: >> That note about "make sure it looks good" reminded me that "make >> patchcheck" is going to need updating to handle git, which means >> updating Tools/scripts/patchcheck.py >> >> Brett, how w

[core-workflow] What instructions to give for squashing PRs from the CLI?

2016-10-07 Thread Brett Cannon
While we will use GitHub's Squash and Merge button for PRs, that doesn't meant everyone will want to use it; some people just prefer using a CLI. That means we need to come up with a set of instructions on how to take a GitHub PR and perform a squash commit manually at the CLI (committing a patch f

Re: [core-workflow] What instructions to give for squashing PRs from the CLI?

2016-10-07 Thread Oleg Broytman
On Thu, Oct 06, 2016 at 07:43:21PM +, Brett Cannon wrote: > While we will use GitHub's Squash and Merge button for PRs, that doesn't > meant everyone will want to use it; some people just prefer using a CLI. > That means we need to come up with a set of instructions on how to take a > GitHub P

Re: [core-workflow] What instructions to give for squashing PRs from the CLI?

2016-10-07 Thread Maciej Szulik
I usually go with the visual version which goes like this: 1. git rebase -i HEAD~2 (where 2 means here 2 previous commits) 2. now in editor you can pick which commit can be squashed to which (all nicely described) 3. mark 2nd commit, which will be squashed to previous with squash, write changes an

Re: [core-workflow] instructions for cherrypicking a change from master

2016-10-07 Thread Maciej Szulik
On Fri, Oct 7, 2016 at 4:28 AM, Chris Angelico wrote: > On Fri, Oct 7, 2016 at 1:26 PM, Nick Coghlan wrote: > > On 7 October 2016 at 11:55, Chris Angelico wrote: > >> If you want to, you can 'git cherry-pick -x 142a57', which will add a > >> linking comment to the commit that it creates, saying

Re: [core-workflow] instructions for cherrypicking a change from master

2016-10-07 Thread Chris Angelico
On Sat, Oct 8, 2016 at 8:31 AM, Maciej Szulik wrote: > There's one nit with that cherry-pick, it already creates the commit, and > current > description states you should create a commit after running tests [1]. > > [1] > http://cpython-devguide.readthedocs.io/en/github/committing.html#merging-bet

Re: [core-workflow] instructions for cherrypicking a change from master

2016-10-07 Thread Maciej Szulik
On Fri, Oct 7, 2016 at 11:37 PM, Chris Angelico wrote: > On Sat, Oct 8, 2016 at 8:31 AM, Maciej Szulik wrote: > > There's one nit with that cherry-pick, it already creates the commit, and > > current > > description states you should create a commit after running tests [1]. > > > > [1] > > http:

Re: [core-workflow] instructions for cherrypicking a change from master

2016-10-07 Thread Chris Angelico
On Sat, Oct 8, 2016 at 9:14 AM, Maciej Szulik wrote: > Totally agree, that's why I went with that change and left the history > behind. > But run tests is still required :) Oh sure. Definitely run the tests. No disagreement there :) ChrisA ___ core-wor

Re: [core-workflow] What instructions to give for squashing PRs from the CLI?

2016-10-07 Thread Barry Warsaw
On Oct 07, 2016, at 01:35 PM, Oleg Broytman wrote: >$ git fetch github pull/$ID/head:$BRANCHNAME >$ git checkout master >$ git merge --squash $BRANCHNAME >$ git branch -d $BRANCHNAME This works well, and is generally the instructions that GitLab provides for local CLI merges. A f

Re: [core-workflow] instructions for cherrypicking a change from master

2016-10-07 Thread Barry Warsaw
On Oct 07, 2016, at 11:31 PM, Maciej Szulik wrote: >There's one nit with that cherry-pick, it already creates the commit, and >current description states you should create a commit after running tests >[1]. You can also use cherry-pick -n/--no-commit. Cheers, -Barry pgpKczvGZ8e6Z.pgp Descripti