diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2017-04-09 19:22:36 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 19:22:36 +1000 |
| commit | 4c116cb3b3ee38cae229f7e0df0cd2045fe73c27 (patch) | |
| tree | 8928eee640aadeaee74f28a42afe34017086d2d0 /Tools | |
| parent | af685f9050416da8050e0ec11a8dff9afd4130e7 (diff) | |
| download | cpython-git-4c116cb3b3ee38cae229f7e0df0cd2045fe73c27.tar.gz | |
bpo-29798: Handle git worktree in patchcheck (#1058) (#1060)
The original attempted fix missed an `isdir()` call in
`get_base_branch()`.
(cherry picked from commit 2abfdf5a81383d3b1ed6b7321903a9a168c373c5)
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/scripts/patchcheck.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py index f4ec7d8a30..33a9fead87 100755 --- a/Tools/scripts/patchcheck.py +++ b/Tools/scripts/patchcheck.py @@ -70,7 +70,7 @@ def get_git_upstream_remote(): @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')): + if not os.path.exists(os.path.join(SRCDIR, '.git')): # Not a git checkout, so there's no base branch return None version = sys.version_info |