Skip to content

Commit

Permalink
Issue #29798: Handle git worktree in patchcheck (#1058)
Browse files Browse the repository at this point in the history
The original attempted fix missed an `isdir()` call in
`get_base_branch()`.
  • Loading branch information
ncoghlan authored Apr 9, 2017
1 parent 64c8f70 commit 2abfdf5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Tools/scripts/patchcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2abfdf5

Please sign in to comment.