diff options
Diffstat (limited to 'git/refs')
| -rw-r--r-- | git/refs/head.py | 21 | ||||
| -rw-r--r-- | git/refs/reference.py | 2 | ||||
| -rw-r--r-- | git/refs/symbolic.py | 6 |
3 files changed, 13 insertions, 16 deletions
diff --git a/git/refs/head.py b/git/refs/head.py index fe820b10..a1d8ab46 100644 --- a/git/refs/head.py +++ b/git/refs/head.py @@ -133,18 +133,15 @@ class Head(Reference): raise ValueError("Incorrect parameter type: %r" % remote_reference) # END handle type - writer = self.config_writer() - if remote_reference is None: - writer.remove_option(self.k_config_remote) - writer.remove_option(self.k_config_remote_ref) - if len(writer.options()) == 0: - writer.remove_section() - # END handle remove section - else: - writer.set_value(self.k_config_remote, remote_reference.remote_name) - writer.set_value(self.k_config_remote_ref, Head.to_full_path(remote_reference.remote_head)) - # END handle ref value - writer.release() + with self.config_writer() as writer: + if remote_reference is None: + writer.remove_option(self.k_config_remote) + writer.remove_option(self.k_config_remote_ref) + if len(writer.options()) == 0: + writer.remove_section() + else: + writer.set_value(self.k_config_remote, remote_reference.remote_name) + writer.set_value(self.k_config_remote_ref, Head.to_full_path(remote_reference.remote_head)) return self diff --git a/git/refs/reference.py b/git/refs/reference.py index 3e132aef..cc99dc26 100644 --- a/git/refs/reference.py +++ b/git/refs/reference.py @@ -50,7 +50,7 @@ class Reference(SymbolicReference, LazyMixin, Iterable): #{ Interface - def set_object(self, object, logmsg=None): + def set_object(self, object, logmsg=None): # @ReservedAssignment """Special version which checks if the head-log needs an update as well :return: self""" oldbinsha = None diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py index 894b26d5..ebaff8ca 100644 --- a/git/refs/symbolic.py +++ b/git/refs/symbolic.py @@ -218,7 +218,7 @@ class SymbolicReference(object): return self - def set_object(self, object, logmsg=None): + def set_object(self, object, logmsg=None): # @ReservedAssignment """Set the object we point to, possibly dereference our symbolic reference first. If the reference does not exist, it will be created @@ -229,7 +229,7 @@ class SymbolicReference(object): :note: plain SymbolicReferences may not actually point to objects by convention :return: self""" if isinstance(object, SymbolicReference): - object = object.object + object = object.object # @ReservedAssignment # END resolve references is_detached = True @@ -595,7 +595,7 @@ class SymbolicReference(object): # END for each directory to walk # read packed refs - for sha, rela_path in cls._iter_packed_refs(repo): + for sha, rela_path in cls._iter_packed_refs(repo): # @UnusedVariable if rela_path.startswith(common_path): rela_paths.add(rela_path) # END relative path matches common path |