Skip to content
This repository has been 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
merged 2 commits into from
Aug 17, 2016

Conversation

zaggino
Copy link
Contributor

@zaggino zaggino commented Aug 16, 2016

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

@ficristo
Copy link
Collaborator

@zaggino it would be awesome if you can add a test case.

@petetnt
Copy link
Collaborator

petetnt commented Aug 16, 2016

Most likely fixes things like brackets-userland/brackets-git#1274 to some extent. Looks good to me.

@ficristo ficristo added this to the Release 1.8 milestone Aug 16, 2016
@zaggino
Copy link
Contributor Author

zaggino commented Aug 17, 2016

@ficristo test added, i've tested that it fails before and passes after the fix too

@nethip
Copy link
Contributor

nethip commented Aug 17, 2016

Nice fix @zaggino . LGTM.

Note: I am going ahead with the merge. Travis is failing because of the API limit issues.

@nethip nethip merged commit 86c037f into master Aug 17, 2016
@nethip
Copy link
Contributor

nethip commented Aug 17, 2016

Thanks @zaggino

@zaggino zaggino deleted the zaggino/issue-11826 branch August 17, 2016 04:46
@ficristo
Copy link
Collaborator

test added

@zaggino great job, thank you.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants