diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2017-03-12 09:37:09 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-12 09:37:09 (GMT) |
| commit | 6a6d090612dd7deaac2bc0399fad743e5e2db606 (patch) | |
| tree | 08aa0a27c1d6f210d69080de6deec01ff29323c2 /Tools/scripts | |
| parent | 8999caeb003ed292011e98b8a30746cce787a125 (diff) | |
| download | cpython-6a6d090612dd7deaac2bc0399fad743e5e2db606.zip cpython-6a6d090612dd7deaac2bc0399fad743e5e2db606.tar.gz cpython-6a6d090612dd7deaac2bc0399fad743e5e2db606.tar.bz2 | |
bpo-29798: Handle git worktree in `make patchcheck` (#629)
In git worktree directories, `.git` is a configuration
file rather than a subdirectory
Diffstat (limited to 'Tools/scripts')
| -rwxr-xr-x | Tools/scripts/patchcheck.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py index 7a04aaf..f4ec7d8 100755 --- a/Tools/scripts/patchcheck.py +++ b/Tools/scripts/patchcheck.py @@ -98,7 +98,10 @@ def changed_files(base_branch=None): cmd += ' --rev qparent' with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) as st: return [x.decode().rstrip() for x in st.stdout] - elif os.path.isdir(os.path.join(SRCDIR, '.git')): + elif os.path.exists(os.path.join(SRCDIR, '.git')): + # We just use an existence check here as: + # directory = normal git checkout/clone + # file = git worktree directory if base_branch: cmd = 'git diff --name-status ' + base_branch else: |