That is correct, and that doesn't need fixing - it is the correct layout for us.
What needs fixing is finding a way to prevent accidentally pushing to the wrong git remote. Unfortunately the ASF repositories don't offer any permissions or other mechanisms to help; in fact they require us to set up the "wrong" way. My recommendation would be for all devs to pull from the github ASF mirror and push to Gerrit, and not have a remote for ASF at all. Ceej aka Chris Hillery On Jul 13, 2015 3:34 PM, "Jochen Wiedmann" <[email protected]> wrote: > Hi, Ian, > > the information that I read from your mail is that there are currently > two Git repositories in use: One being the "official apache > repository", the other being the repository with the "Gerrit master > branch". > > Is that impression correct? If so, what are the reasons? And what can > we do to fix that? > > Thanks, > > Jochen > > > On Mon, Jul 13, 2015 at 9:01 PM, Ian Maxon <[email protected]> wrote: > > Hey all, > > If you haven't pulled from > > https://git-wip-us.apache.org/repos/asf?p=incubator-asterixdb.git > > (i.e. asterixdb's official apache repository) lately, please don't > > until you get an email giving the all-clear. Same goes for submitting > > and merging patches from Gerrit. Something inadvertently got committed > > to the head of the ASF master branch, which does not exactly agree > > with the head of Gerrit's master branch, so they are diverged at the > > moment. > > > > Additionally, if in your AsterixDB repository, 'git rev-parse > > asf/master' returns c66d23a5ac65ec5218ee47134aea423fd62a32cc , please > > reply to this so we know who might be affected. This means you have > > the latest from the ASF repository- which we may have to force-push > > and overwrite the latest commit from. > > > > Thanks, > > -Ian > > > > -- > Any world that can produce the Taj Mahal, William Shakespeare, > and Stripe toothpaste can't be all bad. (C.R. MacNamara, One Two Three) >
