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

fix(core): set default branch to main if no git #28854

Merged

Conversation

xiongemi
Copy link
Collaborator

@xiongemi xiongemi commented Nov 8, 2024

Current Behavior

Expected Behavior

Related Issue(s)

Fixes #

@xiongemi xiongemi requested a review from a team as a code owner November 8, 2024 17:56
@xiongemi xiongemi requested a review from FrozenPandaz November 8, 2024 17:56
Copy link

vercel bot commented Nov 8, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Skipped Deployment
Name Status Preview Updated (UTC)
nx-dev ⬜️ Ignored (Inspect) Visit Preview Nov 11, 2024 8:40pm

@@ -65,6 +65,15 @@ export function createNxJsonFile(
}

function deduceDefaultBase() {
try {
Copy link
Collaborator

Choose a reason for hiding this comment

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

We shouldn't have to run a different command to make sure git doesn't exist...

Can we check the error some how?

We're running git in the line below.. that will error if there's no git... can we somehow check the first error to see if it says that git is not installed?

Also it seems like the final catch here says to return master... so maybe this should return master too? 👀 I don't know if now is the time to change that return to main

@xiongemi xiongemi force-pushed the feature/nxc-1180-defaultbase-should-be-main-by-default branch from 535c76a to 4abe575 Compare November 11, 2024 19:22
@xiongemi xiongemi force-pushed the feature/nxc-1180-defaultbase-should-be-main-by-default branch from 4abe575 to b0ee13e Compare November 11, 2024 20:37
@FrozenPandaz FrozenPandaz merged commit 2d77495 into master Nov 12, 2024
6 checks passed
@FrozenPandaz FrozenPandaz deleted the feature/nxc-1180-defaultbase-should-be-main-by-default branch November 12, 2024 18:13
FrozenPandaz pushed a commit that referenced this pull request Nov 13, 2024
<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #

(cherry picked from commit 2d77495)
Copy link

This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 18, 2024
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.

2 participants