[Mesa-dev] abundance of branches in mesa.git

[Ilia Mirkin]

Hello,

There are a *ton* of branches in the upstream mesa git. Here is a full list:

  origin/10.0
  origin/10.1
  origin/10.2
  origin/10.3
  origin/10.4
  origin/10.5
  origin/10.6
  origin/7.10
  origin/7.11
  origin/7.8
  origin/7.8-gles
  origin/7.9
  origin/8.0
  origin/9.0
  origin/9.1
  origin/9.2
  origin/965-glsl
  origin/965-ttm
  origin/HEAD -> origin/master
  origin/R300_DRIVER
  origin/amdgpu
  origin/arb_copy_buffer
  origin/arb_fbo
  origin/arb_fbo_cleanup
  origin/arb_fbo_indirect
  origin/arb_geometry_shader4
  origin/arb_half_float_vertex
  origin/arb_map_buffer_range
  origin/arb_robustness
  origin/arb_sampler_objects
  origin/arb_sync
  origin/arb_vertex_array_object
  origin/asm-shader-rework-1
  origin/asm-shader-rework-2
  origin/asm-shader-rework-3
  origin/auto-cherry-for-8.0
  origin/autoconf
  origin/broadwell
  origin/cxx-1-branch
  origin/d3d1x-addons
  origin/direct_state_access
  origin/draw-instanced
  origin/draw-ply
  origin/dri2-swapbuffers
  origin/drm-gem
  origin/egl-drm
  origin/embedded-1-branch
  origin/embedded-2-branch
  origin/experimental-1
  origin/ext-provoking-vertex
  origin/flex-and-bison-required
  origin/floating
  origin/fp64_floor
  origin/frontbuffer-removal
  origin/gallium-0.1
  origin/gallium-0.1-dri
  origin/gallium-0.1-dri2
  origin/gallium-0.2
  origin/gallium-array-textures
  origin/gallium-buffer-usage-cleanup
  origin/gallium-clip-state
  origin/gallium-compute
  origin/gallium-context-transfers-2
  origin/gallium-cylindrical-wrap
  origin/gallium-double-opcodes
  origin/gallium-drm-driver-descriptor
  origin/gallium-dynamicstencilref
  origin/gallium-fb-dimensions
  origin/gallium-float-1111-format
  origin/gallium-format-cleanup
  origin/gallium-front-ccw
  origin/gallium-gpu4-texture-opcodes
  origin/gallium-integer-opcodes
  origin/gallium-llvmpipe
  origin/gallium-mesa-7.4
  origin/gallium-msaa
  origin/gallium-new-formats
  origin/gallium-newclear
  origin/gallium-no-nvidia-opcodes
  origin/gallium-no-rhw-position
  origin/gallium-no-texture-blanket
  origin/gallium-nopointsizeminmax
  origin/gallium-render-condition-predicate
  origin/gallium-resource-sampling
  origin/gallium-resources
  origin/gallium-sampler-view
  origin/gallium-softpipe-winsys
  origin/gallium-st-api
  origin/gallium-st-api-dri
  origin/gallium-stream-out
  origin/gallium-sw-api
  origin/gallium-tgsi-semantic-cleanup
  origin/gallium-userbuf
  origin/gallium-util-format-is-supported
  origin/gallium-vertexelementcso
  origin/gallium_draw_llvm
  origin/gallivm-call
  origin/glapi-reorg
  origin/gles3
  origin/glsl-compiler-1
  origin/glsl-continue-return
  origin/glsl-continue-return-7-5
  origin/glsl-pp-rework-1
  origin/glsl-pp-rework-2
  origin/glsl-to-tgsi
  origin/glsl2
  origin/glsl2-llvm
  origin/glsl2-lower-variable-indexing
  origin/graw-tests
  origin/hw_gl_select
  origin/i915tex-pageflip
  origin/i915tex-zone-rendering
  origin/i915tex_branch
  origin/i915tex_privbuffers
  origin/index-swtnl-0.1
  origin/indirect-vbo
  origin/intel-2008-q3
  origin/intel-2008-q4
  origin/kasanen-post-process
  origin/kasanen-post-process-v2
  origin/llvm-cliptest-viewport
  origin/llvm-context
  origin/llvmpipe-duma
  origin/llvmpipe-rast-64
  origin/llvmpipe-wider-regs
  origin/loader-v4
  origin/lp-line-rast
  origin/lp-offset-twoside
  origin/lp-setup-llvm
  origin/lp-surface-tiling
  origin/map-tex-branch
  origin/map-texture-image-v4
  origin/map-texture-image-v5
  origin/master
  origin/mesa
  origin/mesa_20040127_branch
  origin/mesa_20040309_branch
  origin/mesa_20050114_branch
  origin/mesa_3_2_dev
  origin/mesa_3_3_texture_env_combine2
  origin/mesa_3_4_branch
  origin/mesa_4_0_branch
  origin/mesa_5_0_branch
  origin/mesa_6_0_branch
  origin/mesa_6_2_branch
  origin/mesa_6_4_branch
  origin/mesa_7_0_branch
  origin/mesa_7_2_branch
  origin/mesa_7_4_branch
  origin/mesa_7_4_idr_staging
  origin/mesa_7_5_branch
  origin/mesa_7_6_branch
  origin/mesa_7_7_branch
  origin/nv50-compiler
  origin/nvc0
  origin/openchrome-branch
  origin/opengl-es
  origin/opengl-es-v2
  origin/openvg-1.0
  origin/outputswritten64
  origin/pipe-video
  origin/primitive-restart
  origin/r300-bufmgr
  origin/r500-support
  origin/r6xx-r7xx-support
  origin/r6xx-rewrite
  origin/radeon-rewrite
  origin/remove-copyteximage-hook
  origin/remove-driver-date
  origin/remove-max-width
  origin/remove-max-width-2
  origin/remove-redundant-helpers
  origin/renderbuffer-cleanups-v2
  origin/shader-file-reorg
  origin/shader-work
  origin/softpipe_0_1_branch
  origin/sprite-coord
  origin/st-mesa-per-context-shaders
  origin/st-vbo
  origin/texfilter_float_branch
  origin/texformat-xrgb
  origin/texman_0_1_branch
  origin/texmem-1.0
  origin/texmem_0_2_branch
  origin/texmem_0_3_branch
  origin/texture_rg
  origin/texture_rg-2
  origin/thalloc
  origin/vbo_0_1_branch
  origin/vtx-0-1-branch
  origin/vtx-0-2-branch
  origin/xa_branch

The vast, vast, *vast*, majority of these appear to be old branches
that were feature work at the time, or... who knows. I guess there's
no harm in having these, but the OCD in me is being irked -- is there
any reason to keep these around with the exception of:

master
$version (i.e. 9.0, 10.0, mesa_7_7_branch, etc)

... that's it. There was unmerged feature work in direct_state_access,
but I doubt that's going to get merged now that ARB_dsa is in. I bet
75% of these were pushed by accident in the first place. I'm
definitely not going to act now, and will send loud notifications
before I do, but wanted to send out this initial email to see what
people thought.

Cheers,

  -ilia