This repository was archived by the owner on Sep 11, 2020. It is now read-only.
config: adds branches to config for tracking branches against remotes… #803
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
mcuadros
suggested changes
Apr 10, 2018
config/branch.go
Outdated
| // Remote name of remote to track | ||
| Remote string | ||
| // Merge is the local refspec for the branch | ||
| Merge string |
There was a problem hiding this comment.
Since the only value accepted in Merge is a branch the type should be a ReferenceName.
There was a problem hiding this comment.
Thanks for the quick feedback, I'll update the PR as soon as I can
config/branch.go
Outdated
| return errBranchEmptyName | ||
| } | ||
|
|
||
| if b.Merge != "" && !strings.HasPrefix(b.Merge, "refs/heads/") { |
There was a problem hiding this comment.
Check this using ReferenceName.IsBranch
config/config.go
Outdated
| // Branches list of branches, the key is the branch name and should | ||
| // equal Branch.Name | ||
| Branches map[string]*Branch | ||
|
|
There was a problem hiding this comment.
Please remove this extra line and also the 58.
| @@ -87,19 +92,31 @@ func (c *Config) Validate() error { | |||
| } | |||
| } | |||
|
|
|||
| for name, b := range c.Branches { | |||
There was a problem hiding this comment.
This is not covered by tests.
campoy
reviewed
Apr 10, 2018
config/branch.go
Outdated
| // Branch contains information on the | ||
| // local branches and which remote to track | ||
| type Branch struct { | ||
| // Name name of branch |
…, updates clone to track when cloning a branch. Fixes src-d#313 Signed-off-by: Jeremy Chambers <[email protected]>
TheHipbot
force-pushed
the
branch-tracking-on-clone
branch
from
aabcd10 to
02335b1
Compare
mcuadros
approved these changes
Apr 11, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Cloning against a branch will also track that branch against the remote. Allows the ability to create and modify branch tracking in git config.
…, updates clone to track when cloning a branch. Fixes Setup tracking for default branch when cloned. #313
Signed-off-by: Jeremy Chambers [email protected]