Use GTOID instead of PBGitSHA class #217
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
…latest upstream changes. Conflicts: Classes/git/PBGitCommit.h Classes/git/PBGitCommit.m Classes/git/PBGitHistoryGrapher.m Classes/git/PBGitRepository.m Classes/git/PBGitRevList.mm Classes/git/PBGitSHA.h Classes/git/PBGitSHA.m
|
Updated with latest changes from master. |
Closed
|
Looking to merge this, but it seems to break some of the history.js (parent links) |
|
I can take a look at this. |
Conflicts: Classes/Controllers/PBWebHistoryController.m Classes/git/PBGitCommit.h Classes/git/PBGitCommit.m Classes/git/PBGitGrapher.mm Classes/git/PBGitHistoryList.m Classes/git/PBGitRevList.mm Classes/git/PBGitSHA.h Classes/git/PBGitSHA.m
…ay the parent link in history.js.
|
Ok, updated my branch with the latest code from master, fixed some new PBGitSHA references that appeared since then and fixed the parent links in history.js. |
|
Sounds great 👍 |
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.
The PBGitSHA class was almost identical to the GTOID class from Objective-Git so I removed that and use GTOID instead.
This required some changes in Objective-Git (pull request: libgit2/objective-git#206) to make it NSCopying-compliant.