diff options
| author | Yobmod <yobmod@gmail.com> | 2021-07-31 15:42:07 +0100 |
|---|---|---|
| committer | Yobmod <yobmod@gmail.com> | 2021-07-31 15:42:07 +0100 |
| commit | f1e6e8d249bef0de10fd5dcd6605fde03f3a9c8d (patch) | |
| tree | 9fc6c849f0651fd5755447526b227b0a23140ed6 | |
| parent | cf295145c510575d4b1ec4d1b086bcc013281dd0 (diff) | |
| parent | d858916ce254287b70f2b3cc675ff7860171bfba (diff) | |
| download | gitpython-f1e6e8d249bef0de10fd5dcd6605fde03f3a9c8d.tar.gz | |
Merge branch 'main' of https://github.com/Yobmod/GitPython
| -rw-r--r-- | git/objects/submodule/root.py | 4 | ||||
| -rw-r--r-- | test/test_refs.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py index bcac5419..5e84d161 100644 --- a/git/objects/submodule/root.py +++ b/git/objects/submodule/root.py @@ -2,9 +2,7 @@ from .base import ( Submodule, UpdateProgress ) -from .util import ( - find_first_remote_branch -) +from .util import find_first_remote_branch from git.exc import InvalidGitRepositoryError import git diff --git a/test/test_refs.py b/test/test_refs.py index f30d4bda..ab760a6f 100644 --- a/test/test_refs.py +++ b/test/test_refs.py @@ -457,7 +457,7 @@ class TestRefs(TestBase): self.assertRaises(OSError, SymbolicReference.create, rw_repo, symref_path, cur_head.reference.commit) # it works if the new ref points to the same reference - SymbolicReference.create(rw_repo, symref.path, symref.reference).path == symref.path # @NoEffect + assert SymbolicReference.create(rw_repo, symref.path, symref.reference).path == symref.path # @NoEffect SymbolicReference.delete(rw_repo, symref) # would raise if the symref wouldn't have been deletedpbl symref = SymbolicReference.create(rw_repo, symref_path, cur_head.reference) |