Skip to content
This repository was archived by the owner on Feb 12, 2019. It is now read-only.

Conversation

@zanderz
Copy link
Contributor

@zanderz zanderz commented Oct 30, 2018

to include our second PR against microsoft/go-winio: microsoft/go-winio#101

@zanderz zanderz requested review from maxtaco and strib October 30, 2018 22:26
Copy link
Contributor

@strib strib left a comment

Choose a reason for hiding this comment

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

It seems like this commit hash isn't in github.com/keybase/go-winio. Can you commit it there first, and then vendor it in with a merged commit hash?

@zanderz
Copy link
Contributor Author

zanderz commented Oct 31, 2018

Isn't it? Just not on master? I have taken the approach of a 3rd branch, since we have 2 PRs against microsoft/go-winio
keybase/go-winio@4119156

@strib
Copy link
Contributor

strib commented Oct 31, 2018

Sorry, yes I meant it's not in master. We prefer only checking in master commits here, since the branches will be deleted eventually. Is there a reason you can't merge that repo first, and then vendor here?

@zanderz
Copy link
Contributor Author

zanderz commented Nov 1, 2018

ok @strib it vendors a hash from master. Also verified this client no longer crashes for the user with the conflicting AV installed.

@zanderz zanderz closed this Nov 1, 2018
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.

3 participants