23 Sep
2013
23 Sep
'13
8:26 a.m.
I think "git pull --prune" is supposed to clean most of these branches.
On Sun, Sep 22, 2013 at 11:16 PM, Vincent Massol <vincent(a)massol.net> wrote:
ok I think I got tricked by git. I was seeing branches
listed as remotes with "git branch -a" and I assumed there were existing
remotely:
feature-jacoco
jenkins-job-creation
* master
stable-3.1.x
stable-3.3.x
stable-3.5.x
stable-4.0.x
stable-4.1.x
stable-4.3.x
stable-4.4.x
stable-4.5.x
xwiki-commons-4.4-milestone-1
remotes/origin/HEAD -> origin/master
remotes/origin/XWIKI-7748
remotes/origin/feature-AbstractScriptService
remotes/origin/feature-diff
remotes/origin/feature-diff-display
remotes/origin/feature-execution-context-metadata
remotes/origin/feature-extensionauth
remotes/origin/feature-extensiondistribution
remotes/origin/feature-extensionoverridemaven
remotes/origin/feature-extensionrequestcustomization
remotes/origin/feature-filterjson
remotes/origin/feature-improvecm
remotes/origin/jenkins-job-creation
remotes/origin/master
remotes/origin/stable-3.1.x
remotes/origin/stable-3.2.x
remotes/origin/stable-3.3.x
remotes/origin/stable-3.4.x
remotes/origin/stable-3.5.x
remotes/origin/stable-4.0.x
remotes/origin/stable-4.1.x
remotes/origin/stable-4.2.x
remotes/origin/stable-4.3.x
remotes/origin/stable-4.4.x
remotes/origin/stable-4.5.x
remotes/origin/stable-5.1.x
remotes/origin/xwiki-commons-4.4-milestone-1
But I now remember that you have to remove the stale remote branches
(http://stackoverflow.com/questions/5094293/git-remote-branch-deleted-but-st…).
Sorry about that I'll resend some clean proposals later tomorrow.
Thanks
-Vincent
On Sep 22, 2013, at 9:30 PM, Thomas Mortagne <thomas.mortagne(a)xwiki.com> wrote:
--
Thomas Mortagne
It's hard to read a proposal where everyone
has to check for each
branch if it's a real branch on not.
On Sun, Sep 22, 2013 at 6:22 PM, Vincent Massol <vincent(a)massol.net> wrote:
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
On Sep 22, 2013, at 3:00 PM, Thomas Mortagne <thomas.mortagne(a)xwiki.com> wrote:
--
Thomas Mortagne
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs You need to cleenup your local branches, a lot of
the branches you
listed don't exist in Github.
What about the others?
Thanks
-Vincent
On Sat, Sep 21, 2013 at 12:34 PM, Vincent Massol
<vincent(a)massol.net> wrote:
> Hi devs,
>
> There are several remote branches that are probably no longer needed. Let me list
them all and we can decide which one we can remove:
>
> commons:
>
> origin/XWIKI-7748
> origin/feature-AbstractScriptService
> origin/feature-diff
> origin/feature-diff-display
> origin/feature-execution-context-metadata
> origin/feature-extensionauth
> origin/feature-extensiondistribution
> origin/feature-extensionoverridemaven
> origin/feature-extensionrequestcustomization
> origin/feature-filterjson
> origin/feature-improvecm
> origin/feature-jacoco
> origin/jenkins-job-creation
>
> rendering:
>
> origin/feature-jsonsyntax
> origin/itext-pdf-renderer
> origin/markdown-renderer
> origin/restrict-type-parser-per-syntax
>
> platform:
>
> origin/4.5.3
> origin/XWIKI-8450
> origin/XWIKI-8494
> origin/enabled-csrf-protection
> origin/feature-activeinstalls
> origin/feature-alfresco-link
> origin/feature-annotations-merged-with-comments
> origin/feature-authorization-context
> origin/feature-customizable-user-directory
> origin/feature-deprecate-virtual-mode
> origin/feature-distributionwikimode
> origin/feature-execution-context-metadata
> origin/feature-extensionauth
> origin/feature-extensiondistribution
> origin/feature-extensionpages
> origin/feature-filterable-activity-stream
> origin/feature-localization
> origin/feature-luamacro
> origin/feature-lucene-4.0.0-upgrade
> origin/feature-newmodel
> origin/feature-portlet-3.5.x
> origin/feature-resource-and-wiki-modules
> origin/feature-restimportxar
> origin/feature-restimprovements
> origin/feature-security-authorization
> origin/feature-solr-index-thread
> origin/feature-solr-search
> origin/feature-split-activity-and-messageSender-macros
> origin/feature-standardclasses
> origin/feature-store-attachments-newstore
> origin/feature-thumbnails
> origin/feature-upgradeinfinispan
> origin/feature-upgraderestlet2.1
> origin/feature-user-profile-information-editor
> origin/feature-users
> origin/feature-wysiwyg-standalone
> origin/feature-xarpluginextensions
> origin/feature-xclass-property-component
> origin/feature-xwikiexistslocale
>
> enterprise:
>
> origin/enabled-csrf-protection
> origin/feature-activeinstalls
> origin/feature-customizable-user-directory
> origin/feature-extensiondistribution
> origin/feature-filterable-activity-stream
> origin/feature-portlet-3.5.x
> origin/feature-restimprovements
> origin/feature-solr-search
> origin/feature-split-activity-and-messageSender-macros
> origin/feature-thumbnails
> origin/feature-xarpluginextensions
>
> manager:
>
> origin/feature-xarpluginextensions
>
>
> Let me know which one I can remove (I'll reply for the branches I've created
in a response to this email).
>
> Thanks
> -Vincent
> _______________________________________________
> devs mailing list
> devs(a)xwiki.org
> http://lists.xwiki.org/mailman/listinfo/devs
--
Thomas Mortagne
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs