Fix repository creation error handling

Now we also catch GitError as introduced in 0.25.1 See also: libgit2/pygit2#645 and libgit2/pygit2#698
AKSW · Jun 26, 2018 · ae90acb · ae90acb
1 parent 1961e1e
commit ae90acb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/quit/git.py b/quit/git.py
@@ -3,6 +3,7 @@
 import re
 import logging
 
+from _pygit2 import GitError
 from os.path import expanduser, join
 from quit.exceptions import RepositoryNotFound, RevisionNotFound, NodeNotFound, RemoteNotFound
 from quit.exceptions import QuitMergeConflict, QuitGitRefNotFound, QuitGitRepoError
@@ -45,7 +46,7 @@ def __init__(self, path, origin=None, create=False, garbageCollection=False):
 
         try:
             self._repository = pygit2.Repository(path)
-        except KeyError:
+        except (KeyError, GitError):
             if not create:
                 raise RepositoryNotFound(
                     'Repository "%s" does not exist' % path)

diff --git a/tests/test_git.py b/tests/test_git.py
@@ -171,15 +171,15 @@ def createcommit(self):
     def testInitNotExistingsRepo(self):
         dir = TemporaryDirectory()
 
-        repo = quit.git.Repository(self.dir.name)
+        repo = quit.git.Repository(dir.name, create=True)
         self.assertFalse(repo.is_bare)
         self.assertEqual(len(repo.revisions()), 0)
 
         dir.cleanup()
 
     def testInitEmptyRepo(self):
         self.addfile()
-        repo = quit.git.Repository(self.dir.name)
+        repo = quit.git.Repository(self.dir.name, create=True)
         self.assertFalse(repo.is_bare)
         self.assertEqual(len(repo.revisions()), 0)