From: Nick Coghlan Date: Sun, 12 Mar 2017 10:03:35 +0000 (+1000) Subject: bpo-29798: Handle git worktree in `make patchcheck` (#629) (#634) X-Git-Tag: v3.5.4rc1~281 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6aac8c87036c3180916b893d66b1e257b5e2ec2;p=python bpo-29798: Handle git worktree in `make patchcheck` (#629) (#634) In git worktree directories, `.git` is a configuration file rather than a subdirectory (cherry picked from commit 6a6d090612dd7deaac2bc0399fad743e5e2db606) --- diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py index 7a04aafa82..f4ec7d8a30 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: