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.

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

Only discard changes in alias checkouts when catalog compilation called with --force #1103

Merged
merged 5 commits into from
Feb 14, 2025

Conversation

simu
Copy link
Member

@simu simu commented Feb 14, 2025

This ensures that commodore catalog compile doesn't silently discard local changes in a component instance worktree (the same as catalog compilation is already aborted when a component worktree with local changes is encountered).

Checklist

  • Keep pull requests small so they can be easily reviewed.
  • Update the documentation.
  • Update tests.
  • Categorize the PR by setting a good title and adding one of the labels:
    bug, enhancement, documentation, change, breaking, dependency, internal
    as they show up in the changelog
  • Link this PR to related issues.

@simu simu added the bug Something isn't working label Feb 14, 2025
@simu simu force-pushed the fix/abort-on-dirty-alias-checkout branch from d60e6a5 to 949cb8b Compare February 14, 2025 10:30
@simu simu force-pushed the feat/parallel-alias-setup branch from 3f0e27a to 0f9b03b Compare February 14, 2025 11:52
@simu simu force-pushed the fix/abort-on-dirty-alias-checkout branch from 949cb8b to 596d710 Compare February 14, 2025 11:52
@simu simu force-pushed the feat/parallel-alias-setup branch from 0f9b03b to 77abdb0 Compare February 14, 2025 11:59
@simu simu force-pushed the fix/abort-on-dirty-alias-checkout branch 2 times, most recently from 5e67503 to b236d21 Compare February 14, 2025 12:11
@simu simu force-pushed the feat/parallel-alias-setup branch 2 times, most recently from 46f96a4 to 4d5f0fc Compare February 14, 2025 12:43
Base automatically changed from feat/parallel-alias-setup to master February 14, 2025 12:47
simu added 2 commits February 14, 2025 13:48
This makes it easier to write tests that need
`Component.register_alias()`.
@simu simu force-pushed the fix/abort-on-dirty-alias-checkout branch 2 times, most recently from 1b96a8f to 5ec3a45 Compare February 14, 2025 12:58
@simu simu force-pushed the fix/abort-on-dirty-alias-checkout branch from 5ec3a45 to 6e84c27 Compare February 14, 2025 13:14
@simu simu changed the title Don't discard changes in alias checkout unless --force is given Only discard changes in alias checkout when catalog compilation runs with --force Feb 14, 2025
@simu simu changed the title Only discard changes in alias checkout when catalog compilation runs with --force Only discard changes in alias checkouts when catalog compilation runs with --force Feb 14, 2025
@simu simu changed the title Only discard changes in alias checkouts when catalog compilation runs with --force Only discard changes in alias checkouts when catalog compilation called with --force Feb 14, 2025
@simu simu marked this pull request as ready for review February 14, 2025 13:19
@simu simu requested a review from a team as a code owner February 14, 2025 13:19
@simu simu requested a review from a team February 14, 2025 13:19
@simu simu merged commit c1e94ff into master Feb 14, 2025
20 checks passed
@simu simu deleted the fix/abort-on-dirty-alias-checkout branch February 14, 2025 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants