Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(scoop-update): fix branch switching #3372

Merged
merged 6 commits into from
Apr 26, 2019
Merged

fix(scoop-update): fix branch switching #3372

merged 6 commits into from
Apr 26, 2019

Conversation

chawyehsu
Copy link
Member

@chawyehsu chawyehsu commented Apr 25, 2019 •
edited
Loading

close #3368

The hotfix should also be committed into the develop branch.

Ash258
Ash258 reviewed Apr 25, 2019
View reviewed changes
libexec/scoop-update.ps1 Outdated Show resolved Hide resolved
@niheaven niheaven mentioned this pull request Apr 25, 2019
Closed
niheaven
niheaven reviewed Apr 25, 2019
View reviewed changes
libexec/scoop-update.ps1 Outdated Show resolved Hide resolved
@h404bi @niheaven
fix: track the branch
36618d3 
Co-Authored-By: niheaven <niheaven@gmail.com>
@Ash258
Copy link
Contributor

Ash258 commented Apr 25, 2019 •
edited
Loading

@niheaven @h404bi Did you both test on latest commit?

If i need to verify it myself.

@chawyehsu
Copy link
Member Author

Yeah, I tested the whole pr, don't know niheaven whether tested it or not.

@niheaven
Copy link
Member

Tested.

But I think it should add some error action cases, e.g.

  • If user gives a wrong SCOOP_BRANCH name
  • If user has a branch with the same name but incorrect upstreaming branch
  • etc.

@chawyehsu
Copy link
Member Author

chawyehsu commented Apr 26, 2019 •
edited
Loading

Few users would use this feature, except for scoop developers. It's just a fix for #3368 and #3060 , so no need to over design currently I guess.

niheaven
niheaven approved these changes Apr 26, 2019
View reviewed changes
Copy link
Member

@niheaven niheaven left a comment

Choose a reason for hiding this comment

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

LGTM

@r15ch13 r15ch13 merged commit 59f28eb into ScoopInstaller:master Apr 26, 2019
r15ch13 pushed a commit that referenced this pull request Apr 26, 2019
@r15ch13
fix(scoop-update): fix branch switching (#3372) (#3390)
404a6b8 
fix(scoop-update): fix branch switching
@chawyehsu chawyehsu deleted the patch-10 branch May 13, 2019 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ash258 Ash258 Ash258 left review comments

@niheaven niheaven niheaven approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug] Switching branches do not work reliable
5 participants
@chawyehsu @Ash258 @niheaven @r15ch13 @h404bi