diff --git a/kallithea/controllers/compare.py b/kallithea/controllers/compare.py --- a/kallithea/controllers/compare.py +++ b/kallithea/controllers/compare.py @@ -130,6 +130,7 @@ class CompareController(BaseRepoControll else: # no changesets from other repo, ancestor is the other_rev ancestor = other_rev + # dulwich 0.9.9 doesn't have a Repo.close() so we have to mess with internals: gitrepo.object_store.close() gitrepo_remote.object_store.close() diff --git a/kallithea/tests/vcs/test_git.py b/kallithea/tests/vcs/test_git.py --- a/kallithea/tests/vcs/test_git.py +++ b/kallithea/tests/vcs/test_git.py @@ -46,7 +46,8 @@ class GitRepositoryTest(unittest.TestCas # Verify correct quoting of evil characters that should work on posix file systems if sys.platform == 'win32': # windows does not allow '"' in dir names - tricky_path = get_new_dir("tricky-path-repo-$'`") + # and some versions of the git client don't like ` and ' + tricky_path = get_new_dir("tricky-path-repo-$") else: tricky_path = get_new_dir("tricky-path-repo-$'\"`") successfully_cloned = GitRepository(tricky_path, src_url=TEST_GIT_REPO, update_after_clone=True, create=True) @@ -55,7 +56,8 @@ class GitRepositoryTest(unittest.TestCas if sys.platform == 'win32': # windows does not allow '"' in dir names - tricky_path_2 = get_new_dir("tricky-path-2-repo-$'`") + # and some versions of the git client don't like ` and ' + tricky_path_2 = get_new_dir("tricky-path-2-repo-$") else: tricky_path_2 = get_new_dir("tricky-path-2-repo-$'\"`") successfully_cloned2 = GitRepository(tricky_path_2, src_url=tricky_path, bare=True, create=True)