search

freephile / qb

The QualityBox fork of Meza
https://discourse.equality-tech.com
MIT License
3 stars 1 forks source link

Delete all old branches, whether merged or not #23

Closed freephile closed 3 years ago

freephile commented 3 years ago

The repository has grown unwieldy with dozens of old branches that were either merged or abandoned. We will focus on a clean commit history with a 'main' branch and feature branches for development that get merged into 'main'. I'm thinking that since 35.x is out officially now, we'll just rename the 34.x branch 'main' with a "feature" branch for 35.x development. The 35.x branch will merge into main once it's viable.

freephile commented 3 years ago

Note: you can clean up any local repos by issuing a git remote prune freephile

freephile commented 3 years ago

Since my local repo had grown in size to 2.5G, I cleaned up the git internals with the following: git reflog expire --all --expire=now git gc --prune=now --aggressive resulting in a 54M repository

This also set the execute bit on every file (bad) so I reverted that with git diff --summary | grep --color 'mode change 100644 => 100755' | cut -d' ' -f7 | xargs chmod -x

freephile commented 3 years ago

This is complete. The new primary (default) branch is "main" which is identical to 34.x at the moment. 34.x will soon be deleted since it's redundant. The old 'master' branch was merged into 34.x to preserve all history. The only other relevant branch is 'fs' (based on 'main') which has some unique customizations which have not been reduced to configuration.