git branch audit ...

Hi guys,

        As I created a new git branch for some new work, I was interested to
see a rather huge list of malingering branches out there. Even after a:

        git remote prune origin

        I get quite a lot of fluff that seems obsolete. I'd like to remove some
of these branches if they've been merged.

        Thoughts ?

                Michael.

* obsolete or already merged branches...
  origin/feature/layout           # obsoleted by Caolan's new work
  origin/feature/android-x86      # a temporary backup branch for me
  origin/feature/kill-set_soenv   # set_soenv seems to be dead (?)
  origin/feature/crossmsi         # Fridrich just merged this to master
(?)

* unknown status:
  origin/feature/accfixes2
  origin/feature/calc-multiline-input
  origin/feature/cell-format-data-bar
  origin/feature/cell-notes
  origin/feature/chart_errorbars
  origin/feature/cmclayouttrans
  origin/feature/coretext
  origin/feature/external_gbuild
  origin/feature/gbuild_a11y
  origin/feature/gbuild_components
  origin/feature/gbuild_conversions
  origin/feature/gbuild_extensions
  origin/feature/gbuild_help
  origin/feature/gbuild_java
  origin/feature/gbuild_merge
  origin/feature/gbuild_mkdir
  origin/feature/gbuild_scp2
  origin/feature/gbuild_sdext
  origin/feature/gbuild_shell
  origin/feature/gbuild_testtools
  origin/feature/gbuildfixes
  origin/feature/gsoc-calc-perf
  origin/feature/gsoc-calc-perf2
  origin/feature/gsoc2011_wizards
  origin/feature/gsoc_test_improvements
  origin/feature/gsoc_test_improvements2
  origin/feature/gsoc_test_improvements3
  origin/feature/line-numbers-in-basicIDE
  origin/feature/masterpages
  origin/feature/matrix-new-backend
  origin/feature/mspub
  origin/feature/opengl-canvas
  origin/feature/pdf-signing
  origin/feature/remote
  origin/feature/stub_writer
  origin/feature/submodules
  origin/feature/tail_build
  origin/feature/template-dialog
  origin/feature/tubes
  origin/feature/tubes2
  origin/feature/unitymenus
  origin/features/base-preview

--
[hidden email]  <><, Pseudo Engineer, itinerant idiot

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Hi,

On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote:
> Hi guys,
>
> As I created a new git branch for some new work, I was interested to
> see a rather huge list of malingering branches out there. Even after a:
>
> git remote prune origin
>
> I get quite a lot of fluff that seems obsolete. I'd like to remove some
> of these branches if they've been merged.

Yes, if that is how we are doing it. I see many of these branches are
mine (most of origin/feature/gbuild_*)... I apologize to leave them
hanging around.

> * obsolete or already merged branches...
>   origin/feature/kill-set_soenv   # set_soenv seems to be dead (?)

Yes, that was the branch where Norbert killed it.

These have all been merged. (Note that origin/feature/gbuild_help is an
exception. But it can be removed in a pitch, because I have not pushed
anything there yet.)

>   origin/feature/matrix-new-backend

This branch contains Kohei's newest work. He announced it a few days
ago.

>   origin/feature/submodules

I think this branch contains Norbert's git submodule work, so it is
still valid.

D.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Hi Michael,

On 07/18/2012 12:51 PM, Michael Meeks wrote:

>    origin/feature/calc-multiline-input

This was for last year's GSOC, and it's already (manually) merged back
to the mainline.  I will delete it soon (or you can, either way is fine
with me).

>    origin/feature/gsoc-calc-perf
>    origin/feature/gsoc-calc-perf2

I want to keep these branches since they are for this year's GSOC work.
  I'll take care of them once Daniel's work finishes.

>    origin/feature/matrix-new-backend

I'm actively working in that branch.  So, it's a keeper.  I'll delete it
once I'm done.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc


_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote:
>   origin/features/base-preview

Mine. Regularly updated. The idea was to get a Windows tinderbox on
that branch so that I could dogfood my commits to master in production
(without getting the instability of other people's commits to master),
but that got lost in the cracks or something.

--
Lionel
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

I cherry-picked all from feature/crossmsi today, so the branch can happily die. The same happy fate for feature/mspub which is merged.


Sent from Samsung Mobile


Michael Meeks <[hidden email]> wrote:


Hi guys,

As I created a new git branch for some new work, I was interested to
see a rather huge list of malingering branches out there. Even after a:

git remote prune origin

I get quite a lot of fluff that seems obsolete. I'd like to remove some
of these branches if they've been merged.

Thoughts ?

Michael.

* obsolete or already merged branches...
  origin/feature/layout           # obsoleted by Caolan's new work
  origin/feature/android-x86      # a temporary backup branch for me
  origin/feature/kill-set_soenv   # set_soenv seems to be dead (?)
  origin/feature/crossmsi         # Fridrich just merged this to master
(?)

* unknown status:
  origin/feature/accfixes2
  origin/feature/calc-multiline-input
  origin/feature/cell-format-data-bar
  origin/feature/cell-notes
  origin/feature/chart_errorbars
  origin/feature/cmclayouttrans
  origin/feature/coretext
  origin/feature/external_gbuild
  origin/feature/gbuild_a11y
  origin/feature/gbuild_components
  origin/feature/gbuild_conversions
  origin/feature/gbuild_extensions
  origin/feature/gbuild_help
  origin/feature/gbuild_java
  origin/feature/gbuild_merge
  origin/feature/gbuild_mkdir
  origin/feature/gbuild_scp2
  origin/feature/gbuild_sdext
  origin/feature/gbuild_shell
  origin/feature/gbuild_testtools
  origin/feature/gbuildfixes
  origin/feature/gsoc-calc-perf
  origin/feature/gsoc-calc-perf2
  origin/feature/gsoc2011_wizards
  origin/feature/gsoc_test_improvements
  origin/feature/gsoc_test_improvements2
  origin/feature/gsoc_test_improvements3
  origin/feature/line-numbers-in-basicIDE
  origin/feature/masterpages
  origin/feature/matrix-new-backend
  origin/feature/mspub
  origin/feature/opengl-canvas
  origin/feature/pdf-signing
  origin/feature/remote
  origin/feature/stub_writer
  origin/feature/submodules
  origin/feature/tail_build
  origin/feature/template-dialog
  origin/feature/tubes
  origin/feature/tubes2
  origin/feature/unitymenus
  origin/features/base-preview

--
[hidden email]  <><, Pseudo Engineer, itinerant idiot

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Michael Meeks wrote:
>   origin/feature/opengl-canvas
>
A somewhat working version of having canvas render entirely via
opengl (and not just software-render to texture & then use OpenGL as
a blitter on steroids). Most wanted currently: freetype text
support.

>   origin/feature/coretext
>   origin/feature/submodules
>
Norbert's playground it seems.

Cheers,

-- Thorsten

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote:
>   origin/feature/masterpages

integrated in -3-6 and master by Petr

>   origin/feature/tail_build

seems to be a integrated/obsolete branch by dtardon

>   origin/feature/unitymenus

upcoming feature branch, alive

Best,

Bjoern
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Thu, Jul 19, 2012 at 10:08:30AM +0200, Bjoern Michaelsen wrote:
> On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote:
> >   origin/feature/tail_build
>
> seems to be a integrated/obsolete branch by dtardon

Yes, it has been integrated. Sorry, I have forgotten about than one
entirely.

D.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Hi,

On 2012-07-18 at 22:01 +0200, Fridrich Strba wrote:

> I cherry-picked all from feature/crossmsi today, so the branch can
> happily die. The same happy fate for feature/mspub which is merged.

Picking this for the replay, but applies to everybody who knows of a
obsolete branch.  Just do

git push origin :feature/mspub

[for example - I've already killed feature/crossmsi to check I am not
lying], and it will vanish from the server.  Just note that git might
throw some funny warnings at you, like:

----- 8< -----
error: unable to find 0000000000000000000000000000000000000000
fatal: git-cat-file 0000000000000000000000000000000000000000: bad file
fatal: ambiguous argument '': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions
fatal: bad object 0000000000000000000000000000000000000000
fatal: bad object 0000000000000000000000000000000000000000
To ssh://[hidden email]/git/libreoffice/core
 - [deleted]         feature/crossmsi
----- 8< -----

But the last line is the important one here.

Regards,
Kendy

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On 18-07-2012 19:51, Michael Meeks wrote:
>   origin/feature/pdf-signing

My GSoC branch is already merged into master. Actually, some Werror
fixes were applied to the master then, so this branch is ahead of master
by 2 or 3 commits and is safe to remove if mentors (kendy, sberg,
thorsten) are OK.

--
Gökçen Eraslan
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On 19-07-2012 11:44, Gökçen Eraslan wrote:
> On 18-07-2012 19:51, Michael Meeks wrote:
>>   origin/feature/pdf-signing
>
> My GSoC branch is already merged into master. Actually, some Werror
> fixes were applied to the master then, so this branch is ahead of master
> by 2 or 3 commits and is safe to remove if mentors (kendy, sberg,
> thorsten) are OK.
>

Deleted.

--
Gökçen Eraslan


_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Hi Michael, all,

these two branches can probably go too:
origin/feature/line-numbers-in-basicIDE
 – merged some time before 3.5
origin/feature/masterpages
 – merged into 3.6

I am not 100% sure about this one, but I think it's merged too:
origin/feature/cell-format-data-bar
 – Markus's colour scale/data bar work, this should all be available in 3.6

Astron.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Wed, 2012-07-18 at 17:51 +0100, Michael Meeks wrote:

>   origin/feature/cmclayouttrans

A work in progress, to munge translating .ui files into our localization
mechanism. Extraction of translatables done, re-insertion still a
to-do :-)

C.

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Hey,

>   origin/feature/cell-format-data-bar
>   origin/feature/cell-notes

both obsolete now.

>   origin/feature/chart_errorbars

Have to look at that one again.


>   origin/feature/gsoc_test_improvements
>   origin/feature/gsoc_test_improvements2
>   origin/feature/gsoc_test_improvements3

Artur's GSOC branch. IMHO should be held until the end of this year's
google summer of code.

>   origin/feature/line-numbers-in-basicIDE

Has been merged to master by Noel or me.

>   origin/feature/stub_writer

A test branch for mocking writer during tests. I need to look at that
branch when I have more time again.

Regards,
Markus
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Wed, Jul 18, 2012 at 11:51 AM, Michael Meeks <[hidden email]> wrote:
>   origin/feature/accfixes2

acc2 cws... not to be merged any time soon... but still keeping it
around would not hurt

>   origin/feature/coretext

I've been doing some coretext support work in there.. but I have
merged most of it I think... I'll check...

>   origin/feature/external_gbuild

That was a naive attempt to deal with gbuildification of external
libraries... no much future for that attempt, can be killed

Norbert
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On 18 July 2012 21:09, Lionel Elie Mamane <[hidden email]> wrote:
> On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote:
>>   origin/features/base-preview
>
> Mine. Regularly updated.

I think you are re-creating it each time ?
Maybe you could fix typo and rename it next time when re-basing to
feature/base-preview.
Drop the 's' in features/ to make the name consistent with others and
make auto-completion work.

Not that it would cause any real problem.

Matus
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Thu, Jul 19, 2012 at 08:17:35PM +0200, Matúš Kukan wrote:
> On 18 July 2012 21:09, Lionel Elie Mamane <[hidden email]> wrote:
>> On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote:

>>>   origin/features/base-preview

>> Mine. Regularly updated.

> I think you are re-creating it each time ?

Yeah, because we have some hook that keeps me from pushing forced
(non-fast-forward) updates. And I regularly rebase it on top of stable
branch.

> Maybe you could fix typo and rename it next time when re-basing to
> feature/base-preview.

Ah, yes. Sorry for the typo.

--
Lionel
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Thu, 2012-07-19 at 11:36 +0100, Caolán McNamara wrote:
> On Wed, 2012-07-18 at 17:51 +0100, Michael Meeks wrote:
> >   origin/feature/cmclayouttrans
>
> A work in progress, to munge translating .ui files into our localization
> mechanism. Extraction of translatables done, re-insertion still a
> to-do :-)

        Gosh - does that mean that cmclayout got merged to master ? or is it
just renamed somehow ? I didn't see that, and the branch appears not to
be there anymore. What's up there ?

        Thanks,

                Michael.
       
--
[hidden email]  <><, Pseudo Engineer, itinerant idiot

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

        Thanks for all the input, I tried to condense it; what I have is this.
After another

        git remote prune origin

        I see we're a lot cleaner now :-) but I still have these to delete
(will do that Monday absent screams):

* to-kill
  origin/feature/external_gbuild          # ~obsolete attempt to gbuild external modules
  origin/feature/cell-format-data-bar     # obsolete now
  origin/feature/cell-notes               # obsolete now
  origin/feature/line-numbers-in-basicIDE # merged to master
  origin/feature/masterpages              # merged to master & 3.6
  origin/feature/layout                   # obsoleted by Caolan's new work

* unknown status - input appreciated
  origin/feature/chart_errorbars
  origin/feature/gbuild_mkdir
  origin/feature/gbuildfixes
  origin/feature/mork
  origin/feature/template-dialog

        Thanks ! :-)

                Michael.

* keep:
  origin/feature/accfixes2
  origin/feature/gsoc_test_improvements
  origin/feature/gsoc_test_improvements2
  origin/feature/gsoc_test_improvements3
  origin/feature/stub_writer
  origin/feature/cmclayouttrans
  origin/feature/unitymenus
  origin/feature/coretext # Norbert's coretext work
  origin/feature/submodules
  origin/features/base-preview # Lionel's ongoing work
  origin/feature/gsoc-calc-perf
  origin/feature/gsoc-calc-perf2
  origin/feature/matrix-new-backend # Kohei's ongoing work
  origin/feature/opengl-canvas # openGL rendering
  origin/feature/remote # Andrezj's Android remote
  origin/feature/gbuild_help

* already removed:
  origin/feature/android-x86
  origin/feature/pdf-signing
  origin/feature/crossmsi
  origin/feature/kill-set_soenv
  origin/feature/mspub
  origin/feature/multiline-input
  origin/feature/gbuild_a11y
  origin/feature/gbuild_components
  origin/feature/gbuild_conversions
  origin/feature/gbuild_extensions
  origin/feature/gbuild_java
  origin/feature/gbuild_merge
  origin/feature/gbuild_mkdir
  origin/feature/gbuild_scp2
  origin/feature/gbuild_sdext
  origin/feature/gbuild_shell
  origin/feature/gbuild_testtools

--
[hidden email]  <><, Pseudo Engineer, itinerant idiot

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Fri, Jul 20, 2012 at 11:45 AM, Michael Meeks <[hidden email]> wrote:

origin/feature/chart_errorbars
origin/feature/template-dialog

Both of them are already merged
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice