The "merge" button on the github interface won't work for a mirrored repository, but it is pretty easy to cherry-pick the commit to a clone that is connected to gerrit and push from there. Something like this (not tested but I think it's right):
git clone ssh://[email protected]:29418/some/repo git remote add github https://github.com/wikimedia/some-repo.git git fetch github pull/7324/head:name-of-local-branch git checkout master git merge name-of-local-branch git push origin Instead of pushing to master you could also upload the patch to gerrit via git-review just like you'd created the patch locally in the first place. Brya On Fri, Mar 13, 2015 at 1:10 PM, Florian Schmidt <[email protected]> wrote: > Iirc, but i'm not sure, actually it's not possible to merge pull requests > from github :/ > > Florian > > -----Ursprüngliche Nachricht----- > Von: Strainu [mailto:[email protected]] > Gesendet: Freitag, 13. März 2015 19:48 > An: [email protected]; Wikimedia developers > Betreff: Re: [Wikitech-l] What does it take to have a project hosted on the > Wikimedia git server? > > 2015-03-13 14:27 GMT+02:00 [email protected] > <[email protected]>: >> WMF git repos are already (automatically) mirrored to github :) See, >> e.g. https://github.com/wikimedia/mediawiki-extensions-MobileFrontend >> as a mirror of >> https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/M >> obileFrontend (also available on git.wikimedia.org >> https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FMobileFront >> end ) > > I knew about those, but I always assumed these are downstream-only (e.g. only > pull from Gerrit, but no push). If we could accept pull-requests from github > and have them pushed to Gerrit we would basically have the best of both > worlds. :) > > Strainu > >> >> Best, >> Florian >> >> Freundliche Grüße >> Florian Schmidt >> -----Original-Nachricht----- >> Betreff: Re: [Wikitech-l] What does it take to have a project hosted on the >> Wikimedia git server? >> Datum: Fri, 13 Mar 2015 13:16:06 +0100 >> Von: Strainu <[email protected]> >> An: Wikimedia developers <[email protected]> >> >> 2015-03-13 13:53 GMT+02:00 Magnus Manske <[email protected]>: >>> Why not github, or bitbucket? >> >> They're on the list as well, we're exploring all our options. Any >> special reason why you'd prefer those over Wikimedia? >> >> 2015-03-13 13:54 GMT+02:00 Brian Wolff <[email protected]>: >>> See https://www.mediawiki.org/wiki/Gerrit/New_repositories >>> >>> Basically you just have to ask. >>> >>> I think its a nice thing to keep wiki related code, including bots in >>> our git repos as that makes it easier for others to find. >> >> I am personally a bit worried about the complexity of the process on >> gerrit, but I hope that as long as we don't require formal code review >> it should be as simple as git pull/git push, right? >> >> Another related question would be: how hard is it to maintain a github >> mirror of a WMF repository? >> >> Thanks, >> Strainu >> >> _______________________________________________ >> Wikitech-l mailing list >> [email protected] >> https://lists.wikimedia.org/mailman/listinfo/wikitech-l >> >> >> >> _______________________________________________ >> Wikitech-l mailing list >> [email protected] >> https://lists.wikimedia.org/mailman/listinfo/wikitech-l > > > _______________________________________________ > Wikitech-l mailing list > [email protected] > https://lists.wikimedia.org/mailman/listinfo/wikitech-l -- Bryan Davis Wikimedia Foundation <[email protected]> [[m:User:BDavis_(WMF)]] Sr Software Engineer Boise, ID USA irc: bd808 v:415.839.6885 x6855 _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
