Improved remote branch implements #456
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
* AustinChou-fix-remote-branch-tracking: Updated Branch Spec Test Fixed a bug which can cause remote branch considered as local add remote branch deletion feature
| @@ -193,7 +193,12 @@ - (GTBranch *)trackingBranchWithError:(NSError **)error success:(BOOL *)success | |||
| } | |||
|
|
|||
| - (BOOL)updateTrackingBranch:(GTBranch *)trackingBranch error:(NSError **)error { | |||
| int result = git_branch_set_upstream(self.reference.git_reference, trackingBranch.shortName.UTF8String); | |||
| int result = GIT_ENOTFOUND; | |||
| if (trackingBranch.branchType == GTBranchTypeRemote) { | |||
There was a problem hiding this comment.
The indentation here is a bit funny.
|
✨ Thanks! Some notes to address above. |
evianzhow
force-pushed
the
fix-remote-branch-tracking
branch
from
6d5989b to
0c87271
Compare
|
@joshaber check out our new commits, we updated some indentations |
|
Awesome, thanks! 🤘 |
joshaber
added a commit
that referenced
this pull request
Apr 10, 2015
Improved remote branch implements
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.
Modified
- (BOOL)updateTrackingBranch:(GTBranch *)trackingBranch error:(NSError **)errorThe original implement of this method wrongly considered remote tracking branch as local branch and added
remote = .to.git/configwhich supposed to beremote = <remote_name>. This was caused by a wrong parameter objective-git used to pass to underlying method.A test case is added to
GTBranchSpec.m.Added
- (BOOL)deleteBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(void (^)(unsigned int current, unsigned int total, size_t bytes, BOOL *stop))progressBlock;This Method added unpublish support for branches like GitHub client did, it does a
git push <remote_name> :<dest>action using the objective-git private push method.