Skip to content

2nd attempt: Hopefully just requesting pull of GTRepository.h#515

Closed
wilshipley wants to merge 7 commits into
libgit2:masterfrom
delicious-monster:master
Closed

2nd attempt: Hopefully just requesting pull of GTRepository.h#515
wilshipley wants to merge 7 commits into
libgit2:masterfrom
delicious-monster:master

Conversation

@wilshipley
Copy link
Copy Markdown
Contributor

Moved private method declarations -moveHEADToReference:error: and -moveHEADToCommit:error: to the header so they can be used from apps. This seems important because I'm told the only legitimate way to move the HEAD is with these methods (and the underlying git2 functions) and NOT to delete and recreate the HEAD reference manually, so these methods must be public if client apps need to move the HEAD.

…veHEADToCommit:error: to the header so they can be used from apps. This seems important because I'm told the only legitimate way to move the HEAD is with these methods (and the underlying git2 functions) and NOT to delete and recreate the HEAD reference manually, so these methods must be public if client apps need to move the HEAD.
…does "undo" and then makes a change, essentially erasing the rest of the redos) so in some future version of the program we can recover the orphan redo branches, as well.
Comment thread External/libgit2
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still reverting libgit2 to an older version. You should be able to follow the instructions here to push a new commit to this PR.

@mdiep
Copy link
Copy Markdown
Contributor

mdiep commented Aug 26, 2015

A couple small issues, but I think this would be a fine thing to do.

FWIW, there's no need to close the pull request and open a new one. You can just make the changes, push them, and the PR will update. Just be sure to leave a comment so we know to take another look. 😄

@wilshipley
Copy link
Copy Markdown
Contributor Author

Ok, I need to stop doing the pull requests from the GitHub Desktop app because it's hard to see the complete diffs in it. I just looked at the GitHub web interface and it's MUCH more straightforward.

I think part of why I'm fighting with this so much is that in my project I have Objective-Git and libgit2 as peer submodules (both are in the same subdirectory of my main project, not one inside the other) inside my main app repository, whereas in this project libgit2 is a submodule of (and a directory or two below) Objective-Git.

Muddling through...

@phatblat phatblat mentioned this pull request Nov 10, 2015
@joshaber
Copy link
Copy Markdown
Member

#535 tackled this. Thanks!

@joshaber joshaber closed this Nov 11, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants