git: changed rev-parse option for Git 2.25 changes to --show-toplevel#1727
Merged
asottile merged 1 commit intopre-commit:masterfrom Dec 7, 2020
mrogaski:1610_git_toplevel_relpath
Merged
git: changed rev-parse option for Git 2.25 changes to --show-toplevel#1727asottile merged 1 commit intopre-commit:masterfrom mrogaski:1610_git_toplevel_relpath
asottile merged 1 commit intopre-commit:masterfrom
mrogaski:1610_git_toplevel_relpath
Conversation
Contributor
Author
|
This is for #1610. I used pathlib for the path comparisons in the |
asottile
reviewed
Dec 7, 2020
pre_commit/git.py
Outdated
| import logging | ||
| import os.path | ||
| import sys | ||
| from pathlib import Path |
Member
There was a problem hiding this comment.
I would prefer not to use pathlib
you can do the same without it via os.path.commonpath:
root = os.path.realpath(root)
git_dir = os.path.realpath(git_dir)
if os.path.commonpath(root, git_dir) == git_dir:
...
Git 2.25 introduced a change to "rev-parse --show-toplevel" that exposed underlying volumes for Windows drives mapped with SUBST. We use "rev-parse --show-cdup" to get the appropriate path, but must perform an extra check to see if we are in the .git directory.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #1610
Git 2.25 introduced a change to "rev-parse --show-toplevel" that exposed underlying volumes for Windows drives mapped with SUBST. We use "rev-parse --show-cdup" to get the appropriate path, but must perform an extra check to see if we are in the .git directory.