[Asterisk-code-review] digium git: Be specific when pushing a branch (repotools[master])

[Matt Jordan]

Matt Jordan has posted comments on this change.

Change subject: digium_git: Be specific when pushing a branch
......................................................................


Patch Set 1:

(1 comment)

https://gerrit.asterisk.org/#/c/970/1/digium_git.py
File digium_git.py:

Line 178:         self.current_branch = local_name
> Should this be set to branch_name instead? My understanding is that branch_
No, as we need to push our local branch name up when we commit upstream. Consider the following:

branch_name = origin/13
local_name = 13-awesome

We make some modifications to our local branch of 13-awesome, which tracks origin/13. Later, when we commit in push_changes, we need to push '13-awesome' to origin, *not* origin/13. Otherwise we'd be pushing over the remote branch that we were tracking, which would be bad.

Now, if local_name wasn't set, then we would be pushing the remote branch - but that's what we told it to do, since we didn't specify a local_name.


-- 
To view, visit https://gerrit.asterisk.org/970
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2b14956a8802b901159743c18d03cfd5e92b7cb5
Gerrit-PatchSet: 1
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan <mjordan at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>
Gerrit-HasComments: Yes