cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Leo Simons <LSim...@schubergphilis.com>
Subject Re: old branches
Date Thu, 04 Sep 2014 09:17:06 GMT
On Sep 1, 2014, at 4:53 PM, Daan Hoogland <daan.hoogland@gmail.com> wrote:
> By my possibly slightly incorrect count we now have 158 branches in our
> repo. Those include master and old release branches but also a lot of
> obsolete ones.
> 
> Should we clean? (+1 implied)

+1

> Should an RM be responsible of fix branches? (I feel I am, so don't
> hesitate to say yes on that one)

No opinion...

> Should those responsible for a merge be made responsible for deleting the
> merged branch? (+1 implied)

Depends. I can imagine various scenarios where you want to leave a branch around for a while
after you’ve merged it in.

Personally I’d suggest just doing a periodic cleanup. You can use

  git branch --merged

to list candidates for cleanup. For example:

  $ git branch -a --merged master | grep remotes/asf | grep -v ‘/master'
  remotes/asf/Commit-Ratio
  remotes/asf/Health-Check-UI
  remotes/asf/LDAP-UI
  remotes/asf/Reset-VM
  remotes/asf/UI-dedicatedResources
  remotes/asf/bugfix/CID-1230585
  remotes/asf/bugfix/CID-1230587
  remotes/asf/cloudstack-globalization
  remotes/asf/cs2163
  remotes/asf/dvswitch-UI
  remotes/asf/javelin
  remotes/asf/ldapplugin
  remotes/asf/namespacechanges
  remotes/asf/object_store
  remotes/asf/rbac
  remotes/asf/rbd-snap-clone
  remotes/asf/reformat
  remotes/asf/regions
  remotes/asf/scale-UP
  remotes/asf/spring-modularization
  remotes/asf/tampa
  remotes/asf/txn-refactor
  remotes/asf/ucs
  remotes/asf/ui-add-remove-nics
  remotes/asf/ui-cisco-asa1000v-support
  remotes/asf/ui-granular-settings
  remotes/asf/ui-plugins
  remotes/asf/ui-primary-storage-target
  remotes/asf/ui-regions
  remotes/asf/ui-vm-affinity
  remotes/asf/vim51_win8

There’s a lot of branches that are not fully in master, though…

  $ all_branches=$(git branch -a | grep remotes/asf | wc -l)
  $ merged_branches=$(git branch -a --merged master | grep remotes/asf | wc -l)
  $ echo not_merged=$((all_branches - merged_branches))
  not_merged=116

Not all of those should go, but I will guess there’s 50+ of them that would need cleanup
‘by hand’...I guess a good guess for who should be cleaning those up is whoever is the
last person that committed on the branch.


cheers,


Leo


Mime
View raw message