[CALCITE-6627] Tidy up Calcite's branches

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 1.39.0
• Assignee: Julian Hyde
• Reporter: Julian Hyde
• Created: 15/Oct/24 06:49
• Updated: 6 days ago 22:21
• Resolved: 15/Oct/24 07:31

Description

As described in an email thread, a lot of branches in https://github.com/apache/calcite are redundant and should be cleaned up.

I ran a script to generate a list of the current branches and the commit they point to:

for b in $(git branch --list --remotes | grep ' origin/' | grep -v HEAD);
do
  echo $b $(git log -n1 --pretty=format:%h $b);
done
origin/maint-0.4.12 07439313ae # non-trivial release branch
origin/maint-0.4.15 f3a18f9ecc # non-trivial release branch
origin/branch-1.0 ff2dfef9b3 # trivial release branch
origin/branch-1.1 22f42e465b # trivial release branch
origin/branch-1.2 57f06cad04 # trivial release branch
origin/branch-1.3 6b16ca59f1 # trivial release branch
origin/branch-1.4 7a06c4fc43 # trivial release branch
origin/branch-1.5 d71bd3d415 # trivial release branch
origin/branch-1.6 c4d346b0a4 # trivial release branch
origin/branch-1.7 cfd2071a4d # trivial release branch
origin/branch-1.8 b3f3916374 # trivial release branch
origin/branch-1.9 d45c14a63f # trivial release branch
origin/branch-1.10 62904c133d # trivial release branch
origin/branch-1.11 8dd935ee55 # trivial release branch
origin/branch-1.12 0f92251082 # trivial release branch
origin/branch-1.13 09b6d93fc2 # trivial release branch
origin/branch-1.14 b39e232094 # trivial release branch
origin/branch-1.15 fdb17bb794 # trivial release branch
origin/branch-1.16 ff090733c9 # trivial release branch
origin/branch-1.17 d259f96eca # trivial release branch
origin/branch-1.18 5447b9ce6a # trivial release branch
origin/branch-1.19 b8f4edfcf1 # trivial release branch
origin/branch-1.20 3530daaa8c # trivial release branch
origin/branch-1.21 3f7bbae47a # trivial release branch
origin/branch-1.22 7655bd735f # non-trivial release branch
origin/branch-1.23 dfea3871b8 # trivial release branch
origin/branch-1.24 92309ed4c2 # trivial release branch
origin/branch-avatica-1.8 15ad615bd9 # trivial release branch
origin/branch-avatica-1.9 9f664b9c87 # trivial release branch
origin/branch-release c4d346b0a4
origin/dependabot/bundler/site/nokogiri-1.15.6 6ad0ee95f9
origin/issue6607 01a3165923
origin/main 6b95df501d
origin/master f14cf4c32b
origin/review 941cd4e954
origin/site 7e239171b0

I have re-ordered the list slightly, and labeled some of the branches 'trivial release branch' or 'non-trivial release branch'.

Issue Links

• is related to: CALCITE-4147 Rename "master" branch to "main"