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

Change default initial branch to match github #60

Merged
merged 4 commits into from
Feb 4, 2025
Merged

Conversation

davisagli
Copy link
Member

@davisagli davisagli commented Feb 3, 2025

Fixes #59

Tested on my machine with and without init.defaultBranch set in ~/.gitconfig

Copy link

@rohnsha0 rohnsha0 left a comment

Choose a reason for hiding this comment

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

for me it still follows the ~/.gitconfig's defaultBranch

@davisagli
Copy link
Member Author

@rohnsha0 Yes, that is my goal: use init.defaultBranch from ~/.gitconfig if it is set (because that is the user's explicit preference). But if it isn't specified there, then use main instead of master.

@rohnsha0
Copy link

rohnsha0 commented Feb 3, 2025

@rohnsha0 Yes, that is my goal: use init.defaultBranch from ~/.gitconfig if it is set (because that is the user's explicit preference). But if it isn't specified there, then use main instead of master.

ummm, to my surprise. When I removed the init.defaultBranch it was still using the master branch... But looking it it again and wait for others to response!

@stevepiercy
Copy link
Contributor

I have no idea how to run a local checkout of this branch to verify it works. It's not covered in the README, and I lack familiarity with the tooling. @davisagli can you clue me in?

Co-authored-by: Steve Piercy <web@stevepiercy.com>
@davisagli
Copy link
Member Author

@stevepiercy make install, then hatch run cookieplone

Copy link

@rohnsha0 rohnsha0 left a comment

Choose a reason for hiding this comment

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

lgtm

@stevepiercy
Copy link
Contributor

@davisagli FTR yesterday after make install, I tried pipx run cookieplone project and python3 -m cookieplone project. Can you push a commit to add hatch run cookieplone to the README after Setup and a heading "Run Cookieplone with your changes" or something like that while I test?

@stevepiercy
Copy link
Contributor

This might be a new issue, but I tried this:

  [7/17] Should we use prerelease versions? (No): Y
  [8/17] Plone Version (6.0.14): 

I expected 6.1.0rc1.

@davisagli
Copy link
Member Author

@stevepiercy not new, you just ran into #47

@stevepiercy
Copy link
Contributor

Confirming the change works with init:

$ git status  
On branch oogah-boogah

...and without.

$ git status
On branch main

So the change works for me, too.

Copy link
Contributor

@stevepiercy stevepiercy left a comment

Choose a reason for hiding this comment

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

It would be good to add a commit for the README, as I mentioned in #60 (comment), but I won't hold this up for merging. Thank you!

@stevepiercy
Copy link
Contributor

README snippet added in c499c51

@davisagli
Copy link
Member Author

Thanks @stevepiercy

@davisagli davisagli merged commit 9c27a38 into main Feb 4, 2025
6 checks passed
@davisagli davisagli deleted the initial-branch branch February 4, 2025 00:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use main as default branch instead of master branch to be in sync with github
3 participants