openstack/deb-python-pygit2
Code Issues Proposed changes

branch: correct notion of remote-tracking branch and upstream

Browse Source 
The current documentation text seems to be very confused about what a
remote-tracking branch is and what the relationship to an upstream is.

Correct the text to talk about the upstream branch when dealing with the
upstream configuration, instead of implying that it's related to the
setup of remote-tracking branches.
This commit is contained in:
Carlos Martín Nieto 2014-07-06 16:11:27 +02:00
parent b0bf223276
commit 0bfead36b2
1 changed files with 4 additions and 4 deletions

8
src/branch.c

@ -129,7 +129,7 @@ Branch_branch_name__get__(Branch *self)
PyDoc_STRVAR(Branch_remote_name__doc__,
"The name of the remote that the remote tracking branch belongs to.");
"The name of the remote set to be the upstream of this branch.");
PyObject *
Branch_remote_name__get__(Branch *self)
@ -154,8 +154,8 @@ Branch_remote_name__get__(Branch *self)
PyDoc_STRVAR(Branch_upstream__doc__,
"The branch supporting the remote tracking branch or None if this is not a "
"remote tracking branch. Set to None to unset.");
"The branch's upstream branch or None if this branch does not have an upstream set. "
"Set to None to unset the upstream configuration.");
PyObject *
Branch_upstream__get__(Branch *self)
@ -206,7 +206,7 @@ int Branch_upstream__set__(Branch *self, Reference *py_ref)
PyDoc_STRVAR(Branch_upstream_name__doc__,
"The name of the reference supporting the remote tracking branch.");
"The name of the reference set to be the upstream of this one");
PyObject *
Branch_upstream_name__get__(Branch *self)