diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2010-11-23 09:34:44 +0100 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2010-11-23 09:34:44 +0100 |
commit | 739fa140235cc9d65c632eaf1f5cacc944d87cfb (patch) | |
tree | dd6033cadd281858a0d1fd8f477c79b30513b9eb | |
parent | dec4663129f72321a14efd6de63f14a7419e3ed2 (diff) | |
download | gitpython-739fa140235cc9d65c632eaf1f5cacc944d87cfb.tar.gz |
Fixed remaining tests - lets hope that everything is indeed working correctly - as imports changed, every line of code needs to be run to assure all names can be resolved
-rw-r--r-- | objects/submodule/root.py | 3 | ||||
-rw-r--r-- | refs/head.py | 2 | ||||
-rw-r--r-- | refs/reference.py | 1 | ||||
-rw-r--r-- | refs/remote.py | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/objects/submodule/root.py b/objects/submodule/root.py index 2e3cc775..d194cd5b 100644 --- a/objects/submodule/root.py +++ b/objects/submodule/root.py @@ -48,8 +48,7 @@ class RootModule(Submodule): :param previous_commit: If set to a commit'ish, the commit we should use as the previous commit the HEAD pointed to before it was set to the commit it points to now. - If None, it defaults to ORIG_HEAD otherwise, or the parent of the current - commit if it is not given + If None, it defaults to HEAD@{1} otherwise :param recursive: if True, the children of submodules will be updated as well using the same technique :param force_remove: If submodules have been deleted, they will be forcibly removed. diff --git a/refs/head.py b/refs/head.py index f8625bad..91a1132c 100644 --- a/refs/head.py +++ b/refs/head.py @@ -4,6 +4,8 @@ from reference import Reference from git.config import SectionConstraint +from git.util import join_path + from git.exc import GitCommandError __all__ = ["HEAD", "Head"] diff --git a/refs/reference.py b/refs/reference.py index 1f97b92e..a76e2d5d 100644 --- a/refs/reference.py +++ b/refs/reference.py @@ -1,5 +1,6 @@ from symbolic import SymbolicReference import os +from git.objects import Object from git.util import ( LazyMixin, Iterable, diff --git a/refs/remote.py b/refs/remote.py index 7ea9eb46..85dc0f1e 100644 --- a/refs/remote.py +++ b/refs/remote.py @@ -1,5 +1,6 @@ from head import Head from git.util import join_path +from gitdb.util import join import os |