[QA] Help setting up Git
Muzammil Rajwadkar
muzzymon at hotmail.com
Thu Aug 7 16:53:49 UTC 2014
HI guys
Good news, I got it working!
The problem? it turns out, when I was moving one of the folders I found out there was a duplicate .ssh folder in my users folder. By default, when this was setup everything was installed under the Users folder in windows. I originally try to put everything in one folder so the file getting downloaded wont looks a mess in the Users.So, I when to investigate the folder it was missing the two .rsa files. I pasted back the two rsa files in the users folders and now, my setup is now working smooothly. I even ran the git pull master origin and it pulled it successfully. And the ssh muzzymon at gerrit.wikimedia.org -p 29418 -v was fine too.
I am now at the part where I am trying to commit my first local change and learning Vim for the first time (oh joy).
So far now, I can finally sleep and hopefully continue my setup without any problems.... :)
Thanks all for responding to my thread I really do appreciate it.
-Muz
Date: Tue, 5 Aug 2014 11:35:09 -0700
Subject: Re: [QA] Help setting up Git
From: spage at wikimedia.org
To: muzzymon at hotmail.com
CC: qa at lists.wikimedia.org
On Mon, Aug 4, 2014 at 7:41 AM, Muzammil Rajwadkar <muzzymon at hotmail.com> wrote:
One section where I have felt it doesnt explain much was on the setting up git-review page:http://www.mediawiki.org/wiki/Gerrit/git-review#Setting_up_git-review
People think they're helping by adding separate pages for individual steps that duplicate material in the essential Gerrit/Tutorial and which drift out of date. Follow the link for the proper explanation.
It mentions the following sentence: "Gerrit tutorial recommends adding a git-review config file (.gitreview) telling git review to use "origin" as its default remote."
That's a garbled version of what the Gerrit tutorial actually says, I replaced it with a link.
On Mac and Unix git-review has both a per-user configuration, and per-repository configuration. Assuming you're only using git-review with MediaWiki, then you want it to always use "origin", so you specify this once in a .config/git-review/git-review.conf file in your home directory. But apparently Windows doesn't have this. (Bluntly, it sucks to run Windows for much open source development.)
I found two of these files already on my PC but not sure which file location to edit. Would it be either in the: wikimedia\examples or in the wikimedia\core section?
This is the second part, per-repository configuration. Every git repository for which you upload fixes to gerrit for review needs a .git-review file, see https://www.mediawiki.org/wiki/Gerrit/Tutorial#Setting_up_git-review
and would the file inside it look like this:
[gerrit]host=gerrit.wikimedia.orgport=29418project=test/mediawiki/extensions/examples.gitdefaultbranch=master
defaultrebase=0defaultremote = origin
I added in the defaultremote = origin line myself but does that look correct?
You can probably add this line to every repository's local
.gitreview file as you are doing, but I'm not sure. The problem these instructions are trying to solve (having both an "origin" and a "gerrit" remote) is real but I never found out what circumstances trigger it.
Cheers,
--
=S Page Wikimedia Features engineer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.wikimedia.org/pipermail/qa/attachments/20140807/99dc2e36/attachment.html>
More information about the QA
mailing list