This repository was archived by the owner on Sep 6, 2021. It is now read-only.
do nothing when trying to reset with the same content which is already present#12681
Merged
do nothing when trying to reset with the same content which is already present#12681
Conversation
Collaborator
|
@zaggino it would be awesome if you can add a test case. |
Collaborator
|
Most likely fixes things like brackets-userland/brackets-git#1274 to some extent. Looks good to me. |
Contributor
Author
|
@ficristo test added, i've tested that it fails before and passes after the fix too |
Contributor
|
Nice fix @zaggino . LGTM. Note: I am going ahead with the merge. Travis is failing because of the API limit issues. |
Contributor
|
Thanks @zaggino |
Collaborator
@zaggino great job, thank you. |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
I've encountered a case of #11826 and this fixes it (don't necessarily fix all possible cases but it is at least something)
cc @nethip @petetnt