Have rebase and reset return HEAD oid #20116
Merged
Conversation
This file contains 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
simonbyrne
reviewed
Jan 19, 2017
| @@ -333,10 +333,12 @@ function reset!(repo::GitRepo, committish::AbstractString, pathspecs::AbstractSt | |||
| # do not remove entries in the index matching the provided pathspecs with empty target commit tree | |||
| obj === nothing && throw(GitError(Error.Object, Error.ERROR, "`$committish` not found")) | |||
| try | |||
| reset!(repo, Nullable(obj), pathspecs...) | |||
| head = reset!(repo, Nullable(obj), pathspecs...) | |||
| return head | |||
There was a problem hiding this comment.
what's sketchy about this? Now we have finalizers attached, we could just get rid of the try/finally block altogether.
There was a problem hiding this comment.
I thought maybe it should go in the finally block...
There was a problem hiding this comment.
No, because you don't want to return if there was an error.
simonbyrne
approved these changes
Jan 19, 2017
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.
Added tests as well. I think the line 337 in
libgit2.jlmight be a bit sketch?