Fixing has_git to also check if in git repo

Author: swansonk14

README.md

@@ -1,3 +1,7 @@
+<p align="center">
+   <img src="images/logo.png" width="40%" align="middle">
+</p>
+
 # Typed Argument Parser (Tap)
 
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/typed-argument-parser)](https://badge.fury.io/py/typed-argument-parser)

setup.py

@@ -5,14 +5,14 @@
 
 setup(
     name='typed-argument-parser',
-    version='1.4.2',
+    version='1.4.3',
     author='Jesse Michel and Kyle Swanson',
     author_email='[email protected], [email protected]',
     description='Typed Argument Parser',
     long_description=long_description,
     long_description_content_type='text/markdown',
     url='https://github.com/swansonk14/typed-argument-parser',
-    download_url='https://github.com/swansonk14/typed-argument-parser/v_1.4.2.tar.gz',
+    download_url='https://github.com/swansonk14/typed-argument-parser/v_1.4.3.tar.gz',
     license='MIT',
     packages=find_packages(),
     package_data={'tap': ['py.typed']},

tap/utils.py

@@ -21,13 +21,17 @@
 PRIMITIVES = (str, int, float, bool)
 
 
-def check_output(command: List[str]) -> str:
+def check_output(command: List[str], suppress_stderr: bool = True) -> str:
     """Runs subprocess.check_output and returns the result as a string.
 
     :param command: A list of strings representing the command to run on the command line.
+    :param suppress_stderr: Whether to suppress anything written to standard error.
     :return: The output of the command, converted from bytes to string and stripped.
     """
-    return subprocess.check_output(command).decode('utf-8').strip()
+    with open(os.devnull, 'w') as devnull:
+        devnull = devnull if suppress_stderr else None
+        output = subprocess.check_output(command, stderr=devnull).decode('utf-8').strip()
+    return output
 
 
 def has_git() -> bool:
@@ -36,9 +40,9 @@ def has_git() -> bool:
     :return: True if git is installed, False otherwise.
     """
     try:
-        subprocess.check_output(['git', '--version'])
-        return True
-    except FileNotFoundError:
+        output = check_output(['git', 'rev-parse', '--is-inside-work-tree'])
+        return output == 'true'
+    except (FileNotFoundError, subprocess.CalledProcessError):
         return False
 
 

tests/test_utils.py

@@ -9,6 +9,7 @@
 from typing_extensions import Literal
 
 from tap.utils import (
+    has_git,
     get_class_column,
     get_class_variables,
     get_git_root,
@@ -37,6 +38,15 @@ def setUp(self) -> None:
     def tearDown(self) -> None:
         self.temp_dir.cleanup()
 
+    def test_has_git_true(self) -> None:
+        self.assertTrue(has_git())
+
+    def test_has_git_false(self) -> None:
+        with TemporaryDirectory() as temp_dir_no_git:
+            os.chdir(temp_dir_no_git)
+            self.assertFalse(has_git())
+        os.chdir(self.temp_dir.name)
+
     def test_get_git_root(self) -> None:
         self.assertTrue(get_git_root() in f'/private{self.temp_dir.name}')