Re: [Tails-dev] OT: reduce the number of branches in git

Hi,

flapflap wrote (27 May 2015 21:03:42 GMT) :
> I have difficulties with the number of branches in the tails repo that
> clutter the gitk view and make it very hard to verify only some branches
> I'm interested in.

Understood. Note that our release process now includes deleting the
branches that have been merged. anonym, how about you do this step
soonish, as part of the 1.4 release work?

You might also be interested in git fetch's --prune option.

> Furthermore, I get almost all of these branches again from each
> other translator's repo.

No idea why other translators push all these branches to their repo.
This seems totally unnecessary to me. Perhaps ask them to fix
their setup?

> This make gitk or git log --graph almost unusable for me :(

Indeed.

> So, is there a way to ignore some of these branches and track only the
> ones I'm interested in and delete all the others locally?

Yes. See the "fetch" parameter for the "remote" sections in
.git/config.

> How should each contributor handle their public repo: make a git
> clone/fetch of the official tails repo and push everything (incl. all
> branches) again to the contributor's repo, or push only the relevant
> branches needed for others to work on?

The latter IMO, for the reasons you explained above :)

> Moreover, is it ok to delete (git push origin :mybranch) already
> merged/completed branches from a contributor's repo, [...]

Yes. We're merging with --no-ff anyway, so the exact commit we merged
from is recorded.

> How do you deal with all the complexity in the repo and all the
> concurrent activity going on in different parts of tails?

I'll skip that one as it feels too general a question to answer
quickly.

Cheers,
--
intrigeri