Skip to content

update-checkout: Patch up a few flaws with --stash #72704

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.

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

Merged
merged 1 commit into from
Apr 3, 2024

Conversation

AnthonyLatsis
Copy link
Collaborator

  • Stash for each submodule for consistency.
  • Stash untracked changes too.
  • Don't redundantly hard-reset along the stash path.
  • Add some comments and a more truthful description to --stash and --clean.

I’ve left out tests because I don’t want to spoil the good first issue opportunity for anyone (#72523), and I am confident this change is safe.

* Stash for each submodule for consistency.
* Stash untracked changes too.
* Don't redundantly hard-reset along the stash path.
* Add some comments and a more truthful description to `--stash` and
  `--clean`.
@AnthonyLatsis AnthonyLatsis added update-checkout Area → utils: the `update-checkout` script contributor experience utils Area: the build system and other accessory scripts under the "utils" directory labels Mar 29, 2024
Copy link
Contributor

@MaxDesiatov MaxDesiatov left a comment

Choose a reason for hiding this comment

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

Thanks!

@MaxDesiatov
Copy link
Contributor

@swift-ci smoke test

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci smoke test Windows

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test macOS

@AnthonyLatsis AnthonyLatsis merged commit dea09e1 into swiftlang:main Apr 3, 2024
3 checks passed
@AnthonyLatsis AnthonyLatsis deleted the update-checkout-stash branch April 3, 2024 07:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contributor experience update-checkout Area → utils: the `update-checkout` script utils Area: the build system and other accessory scripts under the "utils" directory
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants