Commit 8576534

authored

Merge pull request #2026 from gcmarx/main

correctly handle `uname-cmd` that doesn't point to an executable file

2 parents bf51609 + f3ab5d3 commit 8576534Copy full SHA for 8576534

File tree

+31

-1

lines changed

+31

-1

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,6 @@ Contributors are:`
`55`	`55`	`-Eliah Kagan <eliah.kagan _at_ gmail.com>`
`56`	`56`	`-Ethan Lin <et.repositories _at_ gmail.com>`
`57`	`57`	`-Jonas Scharpf <jonas.scharpf _at_ checkmk.com>`
	`58`	`+-Gordon Marx`
`58`	`59`
`59`	`60`	`Portions derived from other open source works and are clearly marked.`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,12 @@ def _is_cygwin_git(git_executable: str) -> bool:`
`464`	`464`
`465`	`465`	`# Just a name given, not a real path.`
`466`	`466`	`uname_cmd = osp.join(git_dir, "uname")`
	`467`	`+`
	`468`	`+ if not (pathlib.Path(uname_cmd).is_file() and os.access(uname_cmd, os.X_OK)):`
	`469`	`+ _logger.debug(f"Failed checking if running in CYGWIN: {uname_cmd} is not an executable")`
	`470`	`+ _is_cygwin_cache[git_executable] = is_cygwin`
	`471`	`+ return is_cygwin`
	`472`	`+`
`467`	`473`	`process = subprocess.Popen([uname_cmd], stdout=subprocess.PIPE, universal_newlines=True)`
`468`	`474`	`uname_out, _ = process.communicate()`
`469`	`475`	`# retcode = process.poll()`
`@@ -484,7 +490,9 @@ def is_cygwin_git(git_executable: PathLike) -> bool: ...`
`484`	`490`
`485`	`491`
`486`	`492`	`def is_cygwin_git(git_executable: Union[None, PathLike]) -> bool:`
`487`		- if sys.platform == "win32": # TODO: See if we can use `sys.platform != "cygwin"`.
	`493`	`+ # TODO: when py3.7 support is dropped, use the new interpolation f"{variable=}"`
	`494`	`+ _logger.debug(f"sys.platform={sys.platform!r}, git_executable={git_executable!r}")`
	`495`	`+ if sys.platform != "cygwin":`
`488`	`496`	`return False`
`489`	`497`	`elif git_executable is None:`
`490`	`498`	`return False`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`LockFile,`
`35`	`35`	`cygpath,`
`36`	`36`	`decygpath,`
	`37`	`+ is_cygwin_git,`
`37`	`38`	`get_user_id,`
`38`	`39`	`remove_password_if_present,`
`39`	`40`	`rmtree,`
`@@ -349,6 +350,24 @@ def test_decygpath(self, wpath, cpath):`
`349`	`350`	`assert wcpath == wpath.replace("/", "\\"), cpath`
`350`	`351`
`351`	`352`
	`353`	`+class TestIsCygwinGit:`
	`354`	+ """Tests for :func:`is_cygwin_git`"""
	`355`	`+`
	`356`	`+ def test_on_path_executable(self):`
	`357`	`+ # Currently we assume tests run on Cygwin use Cygwin git. See #533 and #1455 for background.`
	`358`	`+ if sys.platform == "cygwin":`
	`359`	`+ assert is_cygwin_git("git")`
	`360`	`+ else:`
	`361`	`+ assert not is_cygwin_git("git")`
	`362`	`+`
	`363`	`+ def test_none_executable(self):`
	`364`	`+ assert not is_cygwin_git(None)`
	`365`	`+`
	`366`	`+ def test_with_missing_uname(self):`
	`367`	+ """Test for handling when `uname` isn't in the same directory as `git`"""
	`368`	`+ assert not is_cygwin_git("/bogus_path/git")`
	`369`	`+`
	`370`	`+`
`352`	`371`	`class _Member:`
`353`	`372`	`"""A member of an IterableList."""`
`354`	`373`

Comments

(0)