[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: OK, this should really be working now (and I checked it on my 2.7 checkout before submitting that PR). Any further problems found should go in a new issue. -- resolution: -> fixed stage: needs patch -> resolved status: open -> closed __

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: New changeset c82d39479a88154bd72a3a304be5f473c118da95 by Nick Coghlan in branch '3.5': bpo-29798: Handle git worktree in patchcheck https://github.com/python/cpython/commit/c82d39479a88154bd72a3a304be5f473c118da95 -- __

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: New changeset 4c116cb3b3ee38cae229f7e0df0cd2045fe73c27 by Nick Coghlan in branch '3.6': bpo-29798: Handle git worktree in patchcheck (#1058) (#1060) https://github.com/python/cpython/commit/4c116cb3b3ee38cae229f7e0df0cd2045fe73c27 -- __

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- pull_requests: +1206 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://mail.

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- pull_requests: +1207 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://mail.

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- pull_requests: +1205 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://mail.

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: Oops, the new PRs and merges haven't shown up automatically because I didn't fix the spelling of the issue number. 3.7 (master): https://github.com/python/cpython/pull/1058 3.6: https://github.com/python/cpython/pull/1060 3.5: https://github.com/python/cpython/pu

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- pull_requests: +1204 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://mail.

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: No, that's the bug that prompted me to reopen the issue. I just got distracted and never submitted the follow-up PR :( -- ___ Python tracker ___

[issue29798] Handle "git worktree" in "make patchcheck"

STINNER Victor added the comment: Tools/scripts/patchcheck.py still checks isdir() in get_base_branch(): @status("Getting base branch for PR", info=lambda x: x if x is not None else "not a PR branch") def get_base_branch(): if not os.path.isdir(os.path.join(SRCDIR, '.git')):

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: New changeset 6a6d090612dd7deaac2bc0399fad743e5e2db606 by Nick Coghlan in branch 'master': bpo-29798: Handle git worktree in `make patchcheck` (#629) https://github.com/python/cpython/commit/6a6d090612dd7deaac2bc0399fad743e5e2db606 -- _

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: New changeset ee10fb9c5b0ae8706bcf7ab70d8d65604f2517a7 by Nick Coghlan in branch '2.7': bpo-29798: Handle git worktree in `make patchcheck` (#629) (#635) https://github.com/python/cpython/commit/ee10fb9c5b0ae8706bcf7ab70d8d65604f2517a7 -- _

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: New changeset 61a82a5fbf1a674b91764652ab70f5dbb9ba50f2 by Nick Coghlan in branch '3.6': bpo-29798: Handle git worktree in `make patchcheck` (#629) (#633) https://github.com/python/cpython/commit/61a82a5fbf1a674b91764652ab70f5dbb9ba50f2 -- _

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: New changeset a6aac8c87036c3180916b893d66b1e257b5e2ec2 by Nick Coghlan in branch '3.5': bpo-29798: Handle git worktree in `make patchcheck` (#629) (#634) https://github.com/python/cpython/commit/a6aac8c87036c3180916b893d66b1e257b5e2ec2 -- _

[issue29798] Handle "git worktree" in "make patchcheck"

Nick Coghlan added the comment: Turns out I missed another isdir() check in get_base_branch(), so this still isn't working properly in git worktree directories. -- resolution: fixed -> stage: resolved -> needs patch status: closed -> open ___ Python

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- resolution: -> fixed stage: -> resolved status: open -> closed ___ Python tracker ___ ___ Python-bugs-l

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- pull_requests: +523 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://mail.p

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- pull_requests: +522 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://mail.p

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- pull_requests: +521 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://mail.p

[issue29798] Handle "git worktree" in "make patchcheck"

Changes by Nick Coghlan : -- pull_requests: +517 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://mail.p

[issue29798] Handle "git worktree" in "make patchcheck"

New submission from Nick Coghlan: While backporting issue 29656 to get "make patchcheck" to play nice with git PR branches, I discovered an incompatibility between the way "git worktree" works and the assumptions in "patchcheck.py". Specifically, in a worktree, ".git" is a file, rather than a