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

Recreate branch if it already exists #19670

Merged
merged 4 commits into from
Feb 25, 2025
Merged

Recreate branch if it already exists #19670

merged 4 commits into from
Feb 25, 2025

Conversation

iliakur
Copy link
Contributor

@iliakur iliakur commented Feb 20, 2025

What does this PR do?

Before

ddev release branch create

would crash if the release branch already exists. One instance where this is problematic is if we want to rerun the command after fixing GitHub token permissions

After

The same ddev command can be run a second time. It will reset the branch previously created.

Motivation

Idempotent commands ftw!

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Add the qa/skip-qa label if the PR doesn't need to be tested during QA.
  • If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

Copy link

codecov bot commented Feb 20, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.06%. Comparing base (72690bb) to head (8951b8a).
Report is 21 commits behind head on master.

Additional details and impacted files
Flag Coverage Δ
activemq ?
cassandra ?
ddev 87.79% <100.00%> (+0.61%) ⬆️
hive ?
hivemq ?
ignite ?
jboss_wildfly ?
kafka ?
presto ?
solr ?

Flags with carried forward coverage won't be shown. Click here to find out more.

@iliakur iliakur added this pull request to the merge queue Feb 25, 2025
Merged via the queue into master with commit 02fc83f Feb 25, 2025
52 checks passed
@iliakur iliakur deleted the ik/robust-create-branch branch February 25, 2025 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants