reset changes for merge #1013
Merged
reset changes for merge #1013
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
| @@ -88,6 +90,11 @@ int git_reset( | |||
| goto cleanup; | |||
| } | |||
|
|
|||
| if (reset_type == GIT_RESET_SOFT && (git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE)) { | |||
There was a problem hiding this comment.
How about introducing a new GIT_EUNMERGED error code and return it here?
There was a problem hiding this comment.
Yep.
On Oct 23, 2012, at 4:02 PM, nulltoken notifications@github.com wrote:
In src/reset.c:
@@ -88,6 +90,11 @@ int git_reset(
goto cleanup;
}
- if (reset_type == GIT_RESET_SOFT && (git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE)) {
How about introducing a new GIT_EUNMERGED error code and return it here?—
Reply to this email directly or view it on GitHub.
|
So far so good... would it make sense to add the other states (rebase, am, bisect) now too? Thoughts on how to expose the "interactive head" during a rebase? libgit2/libgit2sharp#128 (comment) |
|
Rebased on development. @vmg, is this ready for merge or are there additional changes? |
|
Looks great. One of the travis builds has stalled but the other are clean. |
phatblat
pushed a commit
to phatblat/libgit2
that referenced
this pull request
Sep 13, 2014
reset changes for merge
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.
Includes previous PR plus https://github.com/carlosmn/libgit2/blob/e849aa83003d209c53513c69c3c56a8fbfd38f1f/tests-clar/repo/state.c