Branch upstream configuration #1450
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The term 'tracking' is overloaded. Help distinguish what we mean by using 'upstream' for this part of the library.
|
👍 |
| if ((ret = remote_name(&buf, repo, refname)) < 0) | ||
| return ret; | ||
|
|
||
| if (buffer) { |
There was a problem hiding this comment.
IIRC, one shouldn't wrap single statements in braces
There was a problem hiding this comment.
Yeah, this is a left-over
Return the size we'd need to write to instead of simply an error. Split the function into two to be used later by the upstream configuration functions.
| * | ||
| * @return 0 or an error code | ||
| */ | ||
| GIT_EXTERN(int) git_branch_unset_upstream(git_reference *branch); |
There was a problem hiding this comment.
I'd rather see this implemented as git_branch_set_upstream(branch, NULL). Can you make it happen? :)
Add functions to set and unset the upstream configuration to complement the getter we already have.
|
Magnificient. |
phatblat
pushed a commit
to phatblat/libgit2
that referenced
this pull request
Sep 13, 2014
Branch upstream configuration
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First rename
git_branch_trackingtogit_branch_upstreamto use clearer nomenclature and then addset_upstreamandunset_upstreamto let the user manage the upstream configuration without needing to care how the configuration is written.For
set_upstreamI kept going back and forth between passing a{remote, refname}pair and the upstream branch directly. Given the unfortunate complexity of getting the pair, I went with "whatevergit_branch_lookupwill do something with" which should give the least surprising result for a given string.I'm still not quite sure whether the split-up version of
git_branch_remote_nameshould return the remote name or the remote directly, as we then have to load it again inset_upstream.