You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geode.apache.org by Bruce Schuchardt <bs...@pivotal.io> on 2019/04/17 23:17:42 UTC
defunct branches
We have nearly 400 branches in the repo right now. Most of them are for
efforts that have been merged to develop long ago. Don't forget to
delete your branches when you're done with them.
Re: defunct branches
Posted by Jacob Barrett <jb...@pivotal.io>.
> On Apr 18, 2019, at 8:01 AM, Bruce Schuchardt <bs...@pivotal.io> wrote:
>
> It's also pretty weird that the UI doesn't show all of the release branches, like these:
>
> origin/release/1.1
> origin/release/1.2.0
> origin/release/1.2.1
> origin/release/1.3.0
> origin/release/1.4.0
> origin/release/1.5.0
> origin/release/1.6.0
These release branches are deleted after release and the HEAD is tag as rel/v1.6.0 (or whatever).
Re: defunct branches
Posted by Bruce Schuchardt <bs...@pivotal.io>.
It's also pretty weird that the UI doesn't show all of the release
branches, like these:
origin/release/1.1
origin/release/1.2.0
origin/release/1.2.1
origin/release/1.3.0
origin/release/1.4.0
origin/release/1.5.0
origin/release/1.6.0
On 4/17/19 5:06 PM, Jason Huynh wrote:
> Hi Bruce,
>
> I am unable to see the same branches on geode repo. I do see these
> branches on my personal fork but that's because I haven't updated my own
> personal fork in some time...
>
> Is there a chance that your origin is pointing to your personal fork and
> not the Apache Geode Repo?
>
> I am also unable to see these branches through the ui:
> https://github.com/apache/geode/branches/all
>
>
>
> On Wed, Apr 17, 2019 at 4:17 PM Bruce Schuchardt <bs...@pivotal.io>
> wrote:
>
>> We have nearly 400 branches in the repo right now. Most of them are for
>> efforts that have been merged to develop long ago. Don't forget to
>> delete your branches when you're done with them.
>>
>>
>>
Re: defunct branches
Posted by Xiaojian Zhou <gz...@pivotal.io>.
Yes, I cannot find GEODE-3967 either.
%103 ~/git12/geode > git br -r | grep 3967
%103 ~/git12/geode >
On Thu, Apr 18, 2019 at 9:28 AM Patrick Rhomberg <pr...@apache.org>
wrote:
> To elaborate on what Dan said:
>
> What has happened is that your local record of the remote references has
> 400+ remote branch references. Some time ago, I raised the same concern
> that you have here, and we got that number down to a couple dozen. But
> your local references are still there.
>
> git fetch origin will update your local references to your remotes,
> and the --prune
> option on that command will remove any local references that are no longer
> on the remote.
>
> For what it's worth, we do seem to have a handful of branches that are
> still getting pushed to origin for the sake of PRs, etc. While remembering
> to delete your branches after the PR gets merged is well and good, I'd take
> it one step farther and encourage everyone to not sully the common space
> with their work-in-progress or PR branches. That's exactly what a fork is
> for. And then we don't get into this case of accruing extra references on
> origin in the first place.
>
> Imagination is Change.
> ~Patrick
>
> On Thu, Apr 18, 2019 at 8:46 AM Dan Smith <ds...@pivotal.io> wrote:
>
> > You just need to do git remote prune origin. Git doesn't remove remote
> > branches from your local copy automatically.
> >
> > -Dan
> >
> > On Thu, Apr 18, 2019 at 8:08 AM Bruce Schuchardt <bschuchardt@pivotal.io
> >
> > wrote:
> >
> > > Sorry to spam everyone. "git branch -r" seems to be a local thing. I
> > > made a fresh clone of the apache repo and now only see the branches
> > > mentioned in the UI.
> > >
> > > On 4/17/19 5:06 PM, Jason Huynh wrote:
> > > > Hi Bruce,
> > > >
> > > > I am unable to see the same branches on geode repo. I do see these
> > > > branches on my personal fork but that's because I haven't updated my
> > own
> > > > personal fork in some time...
> > > >
> > > > Is there a chance that your origin is pointing to your personal fork
> > and
> > > > not the Apache Geode Repo?
> > > >
> > > > I am also unable to see these branches through the ui:
> > > > https://github.com/apache/geode/branches/all
> > > >
> > > >
> > > >
> > > > On Wed, Apr 17, 2019 at 4:17 PM Bruce Schuchardt <
> > bschuchardt@pivotal.io
> > > >
> > > > wrote:
> > > >
> > > >> We have nearly 400 branches in the repo right now. Most of them are
> > for
> > > >> efforts that have been merged to develop long ago. Don't forget to
> > > >> delete your branches when you're done with them.
> > > >>
> > > >>
> > > >>
> > >
> >
>
Re: defunct branches
Posted by Patrick Rhomberg <pr...@apache.org>.
To elaborate on what Dan said:
What has happened is that your local record of the remote references has
400+ remote branch references. Some time ago, I raised the same concern
that you have here, and we got that number down to a couple dozen. But
your local references are still there.
git fetch origin will update your local references to your remotes,
and the --prune
option on that command will remove any local references that are no longer
on the remote.
For what it's worth, we do seem to have a handful of branches that are
still getting pushed to origin for the sake of PRs, etc. While remembering
to delete your branches after the PR gets merged is well and good, I'd take
it one step farther and encourage everyone to not sully the common space
with their work-in-progress or PR branches. That's exactly what a fork is
for. And then we don't get into this case of accruing extra references on
origin in the first place.
Imagination is Change.
~Patrick
On Thu, Apr 18, 2019 at 8:46 AM Dan Smith <ds...@pivotal.io> wrote:
> You just need to do git remote prune origin. Git doesn't remove remote
> branches from your local copy automatically.
>
> -Dan
>
> On Thu, Apr 18, 2019 at 8:08 AM Bruce Schuchardt <bs...@pivotal.io>
> wrote:
>
> > Sorry to spam everyone. "git branch -r" seems to be a local thing. I
> > made a fresh clone of the apache repo and now only see the branches
> > mentioned in the UI.
> >
> > On 4/17/19 5:06 PM, Jason Huynh wrote:
> > > Hi Bruce,
> > >
> > > I am unable to see the same branches on geode repo. I do see these
> > > branches on my personal fork but that's because I haven't updated my
> own
> > > personal fork in some time...
> > >
> > > Is there a chance that your origin is pointing to your personal fork
> and
> > > not the Apache Geode Repo?
> > >
> > > I am also unable to see these branches through the ui:
> > > https://github.com/apache/geode/branches/all
> > >
> > >
> > >
> > > On Wed, Apr 17, 2019 at 4:17 PM Bruce Schuchardt <
> bschuchardt@pivotal.io
> > >
> > > wrote:
> > >
> > >> We have nearly 400 branches in the repo right now. Most of them are
> for
> > >> efforts that have been merged to develop long ago. Don't forget to
> > >> delete your branches when you're done with them.
> > >>
> > >>
> > >>
> >
>
Re: defunct branches
Posted by Dan Smith <ds...@pivotal.io>.
You just need to do git remote prune origin. Git doesn't remove remote
branches from your local copy automatically.
-Dan
On Thu, Apr 18, 2019 at 8:08 AM Bruce Schuchardt <bs...@pivotal.io>
wrote:
> Sorry to spam everyone. "git branch -r" seems to be a local thing. I
> made a fresh clone of the apache repo and now only see the branches
> mentioned in the UI.
>
> On 4/17/19 5:06 PM, Jason Huynh wrote:
> > Hi Bruce,
> >
> > I am unable to see the same branches on geode repo. I do see these
> > branches on my personal fork but that's because I haven't updated my own
> > personal fork in some time...
> >
> > Is there a chance that your origin is pointing to your personal fork and
> > not the Apache Geode Repo?
> >
> > I am also unable to see these branches through the ui:
> > https://github.com/apache/geode/branches/all
> >
> >
> >
> > On Wed, Apr 17, 2019 at 4:17 PM Bruce Schuchardt <bschuchardt@pivotal.io
> >
> > wrote:
> >
> >> We have nearly 400 branches in the repo right now. Most of them are for
> >> efforts that have been merged to develop long ago. Don't forget to
> >> delete your branches when you're done with them.
> >>
> >>
> >>
>
Re: defunct branches
Posted by Bruce Schuchardt <bs...@pivotal.io>.
Sorry to spam everyone. "git branch -r" seems to be a local thing. I
made a fresh clone of the apache repo and now only see the branches
mentioned in the UI.
On 4/17/19 5:06 PM, Jason Huynh wrote:
> Hi Bruce,
>
> I am unable to see the same branches on geode repo. I do see these
> branches on my personal fork but that's because I haven't updated my own
> personal fork in some time...
>
> Is there a chance that your origin is pointing to your personal fork and
> not the Apache Geode Repo?
>
> I am also unable to see these branches through the ui:
> https://github.com/apache/geode/branches/all
>
>
>
> On Wed, Apr 17, 2019 at 4:17 PM Bruce Schuchardt <bs...@pivotal.io>
> wrote:
>
>> We have nearly 400 branches in the repo right now. Most of them are for
>> efforts that have been merged to develop long ago. Don't forget to
>> delete your branches when you're done with them.
>>
>>
>>
Re: defunct branches
Posted by Bruce Schuchardt <bs...@pivotal.io>.
That's weird. No, I'm not working off of a personal fork.
> git remote -v
origin ssh://git@github.com/apache/geode.git (fetch)
origin ssh://git@github.com/apache/geode.git (push)
And "git branch -r" shows a lot more branches than the UI URL. I see
this on multiple machines where I have cloned the apache repo.
On 4/17/19 5:06 PM, Jason Huynh wrote:
> Hi Bruce,
>
> I am unable to see the same branches on geode repo. I do see these
> branches on my personal fork but that's because I haven't updated my own
> personal fork in some time...
>
> Is there a chance that your origin is pointing to your personal fork and
> not the Apache Geode Repo?
>
> I am also unable to see these branches through the ui:
> https://github.com/apache/geode/branches/all
>
>
>
> On Wed, Apr 17, 2019 at 4:17 PM Bruce Schuchardt <bs...@pivotal.io>
> wrote:
>
>> We have nearly 400 branches in the repo right now. Most of them are for
>> efforts that have been merged to develop long ago. Don't forget to
>> delete your branches when you're done with them.
>>
>>
>>
Re: defunct branches
Posted by Jason Huynh <jh...@pivotal.io>.
Hi Bruce,
I am unable to see the same branches on geode repo. I do see these
branches on my personal fork but that's because I haven't updated my own
personal fork in some time...
Is there a chance that your origin is pointing to your personal fork and
not the Apache Geode Repo?
I am also unable to see these branches through the ui:
https://github.com/apache/geode/branches/all
On Wed, Apr 17, 2019 at 4:17 PM Bruce Schuchardt <bs...@pivotal.io>
wrote:
> We have nearly 400 branches in the repo right now. Most of them are for
> efforts that have been merged to develop long ago. Don't forget to
> delete your branches when you're done with them.
>
>
>