diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2011-05-30 16:32:56 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2011-05-30 16:32:56 +0200 |
| commit | 1f71ed94578799ee1667ba54b66a369e307f415b (patch) | |
| tree | f8e1c3a8507b5306a6a04efa94ffec3c22731bcc /git/refs | |
| parent | 024adf37acddd6a5d8293b6b5d15795c59a142c0 (diff) | |
| download | gitpython-1f71ed94578799ee1667ba54b66a369e307f415b.tar.gz | |
git cmd implementation of repository appears to work, at least this is what the test suggests. Pure python implementation still has some trouble, but this should be very fixable
Diffstat (limited to 'git/refs')
| -rw-r--r-- | git/refs/reference.py | 2 | ||||
| -rw-r--r-- | git/refs/symbolic.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/git/refs/reference.py b/git/refs/reference.py index 838a29e3..5cff74bb 100644 --- a/git/refs/reference.py +++ b/git/refs/reference.py @@ -28,7 +28,7 @@ class Reference(SymbolicReference, LazyMixin, Iterable): Path relative to the .git/ directory pointing to the ref in question, i.e. refs/heads/master""" if not path.startswith(self._common_path_default+'/'): - raise ValueError("Cannot instantiate %r from path %s" % ( self.__class__.__name__, path )) + raise ValueError("Cannot instantiate %r from path %s, maybe use %s.to_full_path(name) to safely generate a valid full path from a name" % ( self.__class__.__name__, path, type(self).__name__)) super(Reference, self).__init__(repo, path) diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py index d670bd47..ddee3809 100644 --- a/git/refs/symbolic.py +++ b/git/refs/symbolic.py @@ -237,7 +237,7 @@ class SymbolicReference(object): is_invalid_type = commit.object.type != self.CommitCls.type else: try: - is_invalid_type = self.repo.resolve(commit).type != self.CommitCls.type + is_invalid_type = self.repo.resolve_object(commit).type != self.CommitCls.type except BadObject: raise ValueError("Invalid object: %s" % commit) #END handle exception @@ -293,7 +293,7 @@ class SymbolicReference(object): write_value = ref.hexsha elif isinstance(ref, basestring): try: - obj = self.repo.resolve(ref+"^{}") # optionally deref tags + obj = self.repo.resolve_object(ref+"^{}") # optionally deref tags write_value = obj.hexsha except BadObject: raise ValueError("Could not extract object from %s" % ref) @@ -481,7 +481,7 @@ class SymbolicReference(object): elif isinstance(reference, SymbolicReference): target = reference.object.hexsha else: - target = repo.resolve(str(reference)) + target = repo.resolve_object(str(reference)) #END handle resoltion #END need resolution |