[
https://issues.apache.org/jira/browse/CALCITE-6627?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17889490#comment-17889490
]
Julian Hyde edited comment on CALCITE-6627 at 10/17/24 10:21 PM:
-----------------------------------------------------------------
I have executed the following commands to delete branches:
{noformat}
git push origin --delete branch-1.0
git push origin --delete branch-1.1
git push origin --delete branch-1.2
git push origin --delete branch-1.3
git push origin --delete branch-1.4
git push origin --delete branch-1.5
git push origin --delete branch-1.6
git push origin --delete branch-1.7
git push origin --delete branch-1.8
git push origin --delete branch-1.9
git push origin --delete branch-1.10
git push origin --delete branch-1.11
git push origin --delete branch-1.12
git push origin --delete branch-1.13
git push origin --delete branch-1.14
git push origin --delete branch-1.15
git push origin --delete branch-1.16
git push origin --delete branch-1.17
git push origin --delete branch-1.18
git push origin --delete branch-1.19
git push origin --delete branch-1.20
git push origin --delete branch-1.21
git push origin --delete branch-1.23
git push origin --delete branch-1.24
git push origin --delete branch-avatica-1.8
git push origin --delete branch-avatica-1.9
git checkout --track origin/branch-1.22
git branch -m branch-1.22 rel/1.22
git push origin rel/1.22
git push origin --delete branch-1.22
git checkout --track origin/maint-0.4.12
git branch -m maint-0.4.12 rel/0.4.12
git push origin rel/0.4.12
git push origin --delete maint-0.4.12
git checkout --track origin/maint-0.4.15
git branch -m maint-0.4.15 rel/0.4.15
git push origin rel/0.4.15
git push origin --delete maint-0.4.15
git push origin --delete branch-release
git push origin --delete issue6607
git push origin --delete master
git push origin --delete review
{noformat}
was (Author: julianhyde):
I have executed the following commands to delete branches:
{noformat}
git push origin --delete branch-1.0
git push origin --delete branch-1.1
git push origin --delete branch-1.2
git push origin --delete branch-1.3
git push origin --delete branch-1.4
git push origin --delete branch-1.5
git push origin --delete branch-1.6
git push origin --delete branch-1.7
git push origin --delete branch-1.8
git push origin --delete branch-1.9
git push origin --delete branch-1.10
git push origin --delete branch-1.11
git push origin --delete branch-1.12
git push origin --delete branch-1.13
git push origin --delete branch-1.14
git push origin --delete branch-1.15
git push origin --delete branch-1.16
git push origin --delete branch-1.17
git push origin --delete branch-1.18
git push origin --delete branch-1.19
git push origin --delete branch-1.20
git push origin --delete branch-1.21
git push origin --delete branch-1.23
git push origin --delete branch-1.24
git push origin --delete branch-avatica-1.8
git push origin --delete branch-avatica-1.9
git checkout --track origin/branch-1.22
git branch -m branch-1.22 rel/1.22
git push origin rel/1.22
git push origin --delete branch-1.22
git checkout --track origin/maint-0.4.12
git branch -m maint-0.4.12 rel/0.4.12
git push origin rel/0.4.12
git push origin --delete maint-0.4.12
git checkout --track origin/maint-0.4.15
git branch -m maint-0.4.15 rel/0.4.15
git push origin rel/0.4.15
git push origin --delete maint-0.4.15
git push origin --delete issue6607
git push origin --delete master
git push origin --delete review
{noformat}
> Tidy up Calcite's branches
> --------------------------
>
> Key: CALCITE-6627
> URL: https://issues.apache.org/jira/browse/CALCITE-6627
> Project: Calcite
> Issue Type: Bug
> Reporter: Julian Hyde
> Assignee: Julian Hyde
> Priority: Major
> Fix For: 1.39.0
>
>
> As described in [an email
> thread|https://lists.apache.org/thread/814y10ngo9cvhz9931vm8t28yv4pm4jx], 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:
> {noformat}
> 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
> {noformat}
> I have re-ordered the list slightly, and labeled some of the branches
> 'trivial release branch' or 'non-trivial release branch'.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
