Re: [Wireshark-dev] Tracking branches, GitHub and Launchpad
On Sun, Dec 17, 2023 at 11:37:23PM +0100, Pascal Quantin wrote:
> 17 déc. 2023 23:29:59 Guy Harris :
>
> > On Dec 17, 2023, at 10:08 AM, Jaap Keuter wrote:
> >
> >> 1. The GitHub mirror is picking up all our cherry-pick branches, which now
> >> run in the hundreds.
> >
> > 1.5. Are cherry-pick branches deleted once the changes on those branches
> > are merged into the version branch and, if not, why not? Do they serve
> > some purpose such as recording history that is, in some fashion, of
> > interest? The changes themselves are in the version branch and, by
> > default, the commit message includes the signature of the commit from which
> > it was cherry-picked.
>
> They are deleted most of the time (when the option is checked in GitLab UI,
> which is the default value). Once in a while I delete a few stale merge
> branches that stay open because the corresponding merge requests were closed
> or because the delete option was not selected, to keep our branches number
> under control.
These branches only appear to get deleted from GitLab. Branch deletions
on GitHub do not appear to get mirrored. I just deleted 216 branches
manually with:
git ls-remote https://github.com/wireshark/wireshark 'cherry-pick*' |
awk '{print $2}' |
xargs git push --delete g...@github.com:wireshark/wireshark.git
I will install a branch protection rule on GitHub, hopefully that
prevents pushing these branches to GitHub.
--
Kind regards,
Peter Wu
https://lekensteyn.nl
___
Sent via:Wireshark-dev mailing list
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Tracking branches, GitHub and Launchpad
17 déc. 2023 23:29:59 Guy Harris : > On Dec 17, 2023, at 10:08 AM, Jaap Keuter wrote: > >> 1. The GitHub mirror is picking up all our cherry-pick branches, which now >> run in the hundreds. > > 1.5. Are cherry-pick branches deleted once the changes on those branches are > merged into the version branch and, if not, why not? Do they serve some > purpose such as recording history that is, in some fashion, of interest? The > changes themselves are in the version branch and, by default, the commit > message includes the signature of the commit from which it was cherry-picked. They are deleted most of the time (when the option is checked in GitLab UI, which is the default value). Once in a while I delete a few stale merge branches that stay open because the corresponding merge requests were closed or because the delete option was not selected, to keep our branches number under control. ___ Sent via:Wireshark-dev mailing list Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Tracking branches, GitHub and Launchpad
On Dec 17, 2023, at 10:08 AM, Jaap Keuter wrote: > 1. The GitHub mirror is picking up all our cherry-pick branches, which now > run in the hundreds. 1.5. Are cherry-pick branches deleted once the changes on those branches are merged into the version branch and, if not, why not? Do they serve some purpose such as recording history that is, in some fashion, of interest? The changes themselves are in the version branch and, by default, the commit message includes the signature of the commit from which it was cherry-picked. ___ Sent via:Wireshark-dev mailing list Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
[Wireshark-dev] Tracking branches, GitHub and Launchpad
Hi, A few observations which probably needs attention. 1. The GitHub mirror is picking up all our cherry-pick branches, which now run in the hundreds. IMHO, these should not be mirrored in the first place. How can we clean this up? 2. Launchpad upstream repo mirrors of GitHub. IMHO, it should mirror from GitLab. 3. The Launchpad mirror has all these cherrypick branches also. IMHO, these should not be mirrored in the first place. How can we clean this up? Regards, Jaap ___ Sent via:Wireshark-dev mailing list Archives:https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
