Re: defunct branches
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 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 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 > > > 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 < > > bschucha...@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
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 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 > 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 < > bschucha...@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
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 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 > > > 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
> On Apr 18, 2019, at 8:01 AM, Bruce Schuchardt 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
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 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
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 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
That's weird. No, I'm not working off of a personal fork. > git remote -v origin ssh://g...@github.com/apache/geode.git (fetch) origin ssh://g...@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 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
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 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. > > >
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. origin/9aa83fedba 222701ad75 GEODE-4110: improve junit ClientCacheRule (#2872) origin/GEM-1722-1629 69cd117ac7 Add debug output origin/GEM-2043b8d04a3b0a WIP origin/GEODE-2290 5934e7e397 GEODE-2290: Remove JarClassLoader origin/GEODE-3237 24dc3a6a40 GEODE-3760 uncaught exception in shunned member removal thread origin/GEODE-3273 b8dc595c6b GEODE-3701 Improve docs on hash index performance (#816) origin/GEODE-3616 4b189cf343 Removing exception squashing from tests. origin/GEODE-3715-javadocs e228a48cd4 GEODE-3715: improve javadocs of DistributedTest rules origin/GEODE-3801-backup-hardlinks-recommit81377bb9ee GEODE-3801: Use hardlinks for backup oplog files (#963) origin/GEODE-5547-RegionManagementDUnitTesta9fe65dd39 GEODE-5547: Log info message when canceling ManagementListener origin/GEODE-6626-gatewayReceiver-metrics 2e0b5b1404 wip origin/MessagePack 5d39e4ab96 Getting closer to some level of madness origin/add-extensions-to-classpath-155484283 f79c8d9a08 Merge branch 'develop' into add-extensions-to-classpath-155484283 origin/add_180_to_old_versions f4e86b2543 Turning CI on and off again origin/better-classpath2cd3dc8579 GEODE-1168 Improves build to automatically add jars to runtime classpath origin/bug/GEODE-5742 fa23da5b89 Previous build failed due to concourse max containers reached origin/cluster-config-cleanup 93399b961f wip origin/concourse-staging 9f6b289cb5 GEODE-5714: Retry ssh connections in concourse origin/debug-alter-runtime 5bc43a2cfe GEODE-5530: Add geode-core project to distributedTestRuntimeOnly origin/develop 064892cc1e GEODE-6662 NioPlainEngine.ensureWrappedCapacity origin/exclude-extensions-in-jar-check a8941fb088 Omit extensions in check of bundled jars origin/featrue/GEODE-5541 41119d66ba change a method signature. origin/feature/CleanMicrometer 52bf5ca1d4 MORE WIP origin/feature/GEM-17727c17f1c971 GEM-1772: Added additional debugging origin/feature/GEM-883 213c7d9221 GEM-883: double check if some code is necessary origin/feature/GEODE-109f3f10fd2c GEODE-10: Reinstating HDFS persistence code origin/feature/GEODE-113af1540f6a Merge remote-tracking branch 'origin/develop' into feature/GEODE-11 origin/feature/GEODE-1153 5fd6ed3dc8 fixed a failure and added source headers origin/feature/GEODE-1209 b1291a46f2 GEODE-1209: For the new serializable class AsyncEventQueueFunctionArgs, added changes for AnalyzeSerializablesJUnitTest to run... origin/feature/GEODE-1269 4d22035246 Fix for the test failure caused due to addition of new element uda-manager origin/feature/GEODE-16065072e116 Merge branch 'feature/GEODE-16' into develop origin/feature/GEODE-178 9c6b36fc12 Modified build to find geode jars and not need geode to be in local repo Added logic to detect buildRoot from gradle.properties from geode project Build target output directory will use buildRoot as it's base directory origin/feature/GEODE-1793 6e0af9a3c9 GEODE_1793 spotless fixes and removal of dead code origin/feature/GEODE-1883 d54080aa48 GEODE-1883: make auth-init optional origin/feature/GEODE-1895 2162effc8f Merge branch 'feature/GEODE-1785' into feature/GEODE-1895 origin/feature/GEODE-1912 809d64d712 GEODE-1912: use Spring shell's parser and delete our own parsing code origin/feature/GEODE-1968 84cfbdfc10 Set aside hibernate cache docs until the corresponding code is mainstreamed. origin/feature/GEODE-1969 40ff2a1324 Merge remote-tracking branch 'origin/develop' into feature/GEODE-1969 origin/feature/GEODE-2097 2a44024225 spotless origin/feature/GEODE-2113 7c2cf54a44 set client retries to 5 and reenable ssl debug output on servers origin/feature/GEODE-2113b b758530f45 GEODE-2113 Implement SSL over NIO origin/feature/GEODE-2160 488850bd7f GEODE-2160: gfsh waits for process exit before reporting success origin/feature/GEODE-2201 d
