]> granicus.if.org Git - python/commitdiff
bpo-29798: Handle git worktree in `make patchcheck` (#629) (#635)
authorNick Coghlan <ncoghlan@gmail.com>
Sun, 12 Mar 2017 10:03:45 +0000 (20:03 +1000)
committerGitHub <noreply@github.com>
Sun, 12 Mar 2017 10:03:45 +0000 (20:03 +1000)
In git worktree directories, `.git` is a configuration
file rather than a subdirectory
(cherry picked from commit 6a6d090612dd7deaac2bc0399fad743e5e2db606)

Tools/scripts/patchcheck.py

index 8a2d90639d4c206c1c4698087c9902adbd5a6184..9f7fb1990dca6c5a32676836a5881f7f9c716931 100755 (executable)
@@ -105,7 +105,10 @@ def changed_files(base_branch=None):
             return [x.decode().rstrip() for x in st.stdout]
         finally:
             st.stdout.close()
-    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: