Skip to content

revert util.expand_path() due to regression #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2021
Merged

revert util.expand_path() due to regression #1240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions git/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,13 +382,10 @@ def expand_path(p: PathLike, expand_vars: bool = ...) -> str:

def expand_path(p: Union[None, PathLike], expand_vars: bool = True) -> Optional[str]:
try:
if p is not None:
p_out = osp.expanduser(p)
if expand_vars:
p_out = osp.expandvars(p_out)
return osp.normpath(osp.abspath(p_out))
else:
return None
p = osp.expanduser(p) # type: ignore
if expand_vars:
p = osp.expandvars(p) # type: ignore
return osp.normpath(osp.abspath(p)) # type: ignore
except Exception:
return None

Expand Down