Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

cleanup branches #6965

Closed
Closed

Description

@J0WI

This repo has 92 branches. Some of them have already been merged, some of them are just versions (so they could be turned into a tag).

@Hainish can we clean them up?

Activity

  1. self-assigned this
    on Oct 11, 2016
  2. Hainish commented on Oct 11, 2016

    @Hainish
    Member

    Sounds reasonable to me - I've self-assigned this.

  3. gloomy-ghost commented on Dec 9, 2016

    @gloomy-ghost
    Collaborator

    Any updates here? Maybe we can delete merged branches first, those have 15k+ commits behind and 0 commits ahead master.

  4. Hainish commented on Dec 9, 2016

    @Hainish
    Member

    There are two categories of branches we need:

    1. Core project branches
      1a. master
      1b. release - for https://www.eff.org/https-everywhere/atlas/
    2. Pull request branches
      2a. https-attempt for example, in In HTTP Nowhere mode, attempt HTTPS before block. #7435

    I'm not sure if we have a comprehensive list of those in (2).

  5. Hainish commented on Dec 9, 2016

    @Hainish
    Member

    I'm not sure of the best way to enumerate (2) except to use the GitHub API, so that's what I'll do now.

  6. Hainish commented on Dec 9, 2016

    @Hainish
    Member

    The only two PRs in category (2) are #7435 and #4462

    I therefore propose we delete all branches other than the following:

    1. master
    2. release
    3. hsts-transform
    4. https-attempt

    If there are no objections, I'll move forward with this on Monday

  7. Hainish commented on Dec 9, 2016

    @Hainish
    Member

    A third possible category is any branches undergoing active development but for which no PR has yet been made. I know of none in this category, but it's possible. @jsha?

  8. jsha commented on Dec 9, 2016

    @jsha
    Member

    I don't know of any either.

  9. Hainish commented on Dec 9, 2016

    @Hainish
    Member

    In that case, I'll be running this to delete 91 branches on Monday:

    git push upstream :0.3.0
    git push upstream :0.9
    git push upstream :1.0
    git push upstream :2.0
    git push upstream :3.0
    git push upstream :3.5
    git push upstream :4.0
    git push upstream :add-mandrill
    git push upstream :async-better-whitelisting
    git push upstream :async
    git push upstream :better-obs-whitelisting
    git push upstream :birthday
    git push upstream :brightcove_fix
    git push upstream :change-test-target
    git push upstream :check-scheme
    git push upstream :chrome-catch
    git push upstream :chrome-translations
    git push upstream :chrome/hotfix
    git push upstream :content_verification
    git push upstream :delete-ruleset-tests
    git push upstream :determ
    git push upstream :dev/android
    git push upstream :disable-disable-enable
    git push upstream :disable-disable-menuitem
    git push upstream :disable-rulesets-june-2015-a
    git push upstream :doc
    git push upstream :faster-build
    git push upstream :feature/http-nowhere-chrome
    git push upstream :firefox-latest2
    git push upstream :fix-netflix
    git push upstream :fix-paste2.org
    git push upstream :fix-rewriter
    git push upstream :fix-user-rules-chromium
    git push upstream :fix-yell
    git push upstream :fix/ocsp
    git push upstream :fix/osx-sed
    git push upstream :fix/rule/tumblr
    git push upstream :forward-google-build
    git push upstream :forward-google
    git push upstream :google-movies
    git push upstream :improve-makecrx
    git push upstream :improve-microsoft
    git push upstream :json-rulesets
    git push upstream :justrun-fix
    git push upstream :makexpi
    git push upstream :mark-dirty-files
    git push upstream :merge/http-nowhere-stable
    git push upstream :new-icons
    git push upstream :new-icons2
    git push upstream :new-icons3
    git push upstream :new-translations
    git push upstream :no-match-rule
    git push upstream :no-sigs
    git push upstream :override-ff
    git push upstream :re-enable-startcom
    git push upstream :release-5.1.1
    git push upstream :release-5.1.2
    git push upstream :release-5.1.3
    git push upstream :remove-dropmarker
    git push upstream :remove-obsolete-listeners
    git push upstream :remove-some-akamai
    git push upstream :remove-stuff
    git push upstream :rename-for-signing
    git push upstream :rename
    git push upstream :revert-2585-patch
    git push upstream :revert-2835-patch-2
    git push upstream :revert-4577-patch-6
    git push upstream :revert-4767-patch-1
    git push upstream :rm-fetch-source
    git push upstream :rm-gitcommit
    git push upstream :rm-more-akamai
    git push upstream :rules_list
    git push upstream :ruleset-auto-update
    git push upstream :run-chromium
    git push upstream :see-all-rulesets
    git push upstream :stable
    git push upstream :style-update
    git push upstream :sys-lxml
    git push upstream :tcypes
    git push upstream :tests
    git push upstream :toolbar-button-event
    git push upstream :translations-improvement
    git push upstream :travis
    git push upstream :update-librarians
    git push upstream :update-ruleset-checker
    git push upstream :update-translations
    git push upstream :wmflabs
  10. Hainish commented on Dec 12, 2016

    @Hainish
    Member

    Done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions