GitHub repository rename and updates
Hi all!
As of today, I've made a few fairly broad changes to the way our repositories are set up. You will need to likely make some changes to your development workflow. But! They should be simple.
First, the changes:
The
dw-free
repository has been renamed todreamwidth
-- because,The
dw-nonfree
repository is no more, it has been merged into thedw-free
under the pathext/dw-nonfree/
.Finally, the
master
branch has been renamed tomain
.
These two changes mean that no more do we have to track and coordinate changes across two repositories, they can be done atomically in one place. Since we don't really support or test running Dreamwidth on its own (without the branding) this will also allow us to simplify development by ultimately collapsing the code, too.
To update your checkout of Dreamwidth, you will need to do two separate things. First, go to Github and to your existing dw-free
repository, go to the settings and:
Rename the repository to
dreamwidth
Go to branches and rename the
master
branch tomain
Once that's done, you need to update your local checkout like this:
cd $LJHOME
# WARNING: Only do this if you have no code here that you care about!
rm -rf ext/dw-nonfree
# Update the repository root (for your "origin" remote, **set your username here**)
git remote set-url origin git@github.com:YOUR_GITHUB_USERNAME/dreamwidth.git
# Update the repository root (for your "upstream" remote, please change as needed)
git remote set-url upstream git@github.com:dreamwidth/dreamwidth.git
# Fetch only to get the new main branch
git fetch
# Switch over to it
git checkout main
# Get rid of local master
git branch -d master
# Redirect HEAD
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
That's it; you should be good to go now. I'll work on updating the Dreamhack scripts shortly, but wanted to get these instructions out. Please let me know if you have any questions/comments/issues.