Git

Version 16 (Gary Bradski, 2013-10-03 05:50 am)

1 13 Gary Bradski
h1. Working with OpenCV git repository.
2 13 Gary Bradski
3 13 Gary Bradski
2. Foreword
4 13 Gary Bradski
5 13 Gary Bradski
Git (http://en.wikipedia.org/wiki/Git_(software)) is distributed source code management system, which we now use to develop OpenCV. Therefore, OpenCV developers and contributors should have git installed and learn at least some basics of it. Of course, in the case of a small patch one may simply create a ticket at http://code.opencv.org/projects/opencv/issues and attach the patch there, but our practice shows that going through the pull request mechanism (see [[How to contribute]]) is much more efficient and for that you need git.
6 13 Gary Bradski
7 13 Gary Bradski
h2. Installing Git
8 13 Gary Bradski
9 13 Gary Bradski
* Windows users: take msysgit from http://code.google.com/p/msysgit/downloads/list. Also install "TortoiseGit":http://code.google.com/p/tortoisegit/, a convenient git front-end, which integrates right into Windows Explorer
10 13 Gary Bradski
* Linux users: install command-line git utility using your package manager, e.g. "apt-get install git" on Ubuntu and Debian. You can use "SmartGit":http://www.syntevo.com/smartgithg/index.html as a GUI client. SmartGit is cross-platform, btw.
11 13 Gary Bradski
* Mac users: if you installed Xcode (which you will need anyway), you already have git. You can use "SourceTree":http://www.sourcetreeapp.com/ as a very good GUI client.
12 13 Gary Bradski
13 13 Gary Bradski
h2. Using Git
14 13 Gary Bradski
15 15 Gary Bradski
Most developers and contributors should work with their personal copy (a fork) of OpenCV repository at GitHub and submit the changes via pull requests, as described at [[How to contribute]]. For example, if you use command-line git utility, you can clone the repository to your computer by running
16 15 Gary Bradski
17 15 Gary Bradski
<pre>git clone https://github.com/<username>/opencv.git</pre>
18 15 Gary Bradski
19 15 Gary Bradski
where &lt;username&gt; is your login at github.
20 13 Gary Bradski
21 10 Gary Bradski
h1. Instruction for core developers
22 10 Gary Bradski
23 16 Gary Bradski
h2. Configuring git
24 10 Gary Bradski
25 10 Gary Bradski
h3. Instruction for Ubuntu users:
26 10 Gary Bradski
27 11 Gary Bradski
* Upload ssh-key to the server. If you haven't created any, do it with the following command: <pre>ssh-keygen -t rsa -f ~/.ssh/id_rsa</pre> Leave the Passphrase empty. Then copy contents of the file  ~/.ssh/id_rsa.pub to the Key field on the  http://code.opencv.org/my/account page. Press Create. Run <pre>ssh-add ~/.ssh/id_rsa</pre> command. It may be critical on some versions of Ubuntu.
28 1
29 5 Gary Bradski
* Clone the repository as described in the section above. Run the following command in local repository folder to be able to push changes
30 5 Gary Bradski
31 5 Gary Bradski
 <pre>git remote set-url origin --push [email protected]:opencv.git</pre>
32 1
33 10 Gary Bradski
h3. Instruction for Windows users:
34 1
35 1
* Download and install an up-to-date version of msysgit from its official site: http://code.google.com/p/msysgit/downloads/list. There is also the portable version (_PortableGit-1.7.11-preview20120710.7z_), which you need only to unpack to get access to the console version of Git. Supposing that for some of us it could be quite enough.
36 1
* Download and install the GUI for Git. There are two popular alternatives:
37 12 Gary Bradski
** TortoiseGit is free, open source (GPL v2). It can be downloaded from http://code.google.com/p/tortoisegit/downloads/list. It has different versions for 32 and 64 bit, so be careful. While installing, locate your msysgit (if it doesn't do that automatically) and choose OpenSSH... (Not PLink... Putty...!).
38 1
** SmartGit is also free, but for non-commercial use only. Written in Java, which can be installed automatically if needed. SmartGit can be downloaded from: http://www.syntevo.com/smartgit/download.html?all=true.  Portable Archive (includes JRE) is recomended for download. It only requires unpacking and locating msysgit on first launch.
39 1
* Generate SSH access key:
40 1
** Launch Git Bash (file git-bash.bat in msysgit folder).
41 1
** Run <pre>ssh-keygen -t rsa -C  "[email protected]"</pre>  with the console. The output will contain information on where it stored the keys.
42 1
** Go to that directory and open the public key (id_rsa.pub) with any text editor. 
43 1
** Copy contents of the file id_rsa.pub to the Key field on the  http://code.opencv.org/my/account page. Press Create.
44 1
* Clone repository, using 'quick' read-only protocol  (git://code.opencv.org/opencv.git).
45 3 Gary Bradski
* Launch Git Bash again and go to the folder that you've cloned the repository to ('.git' folder should have appeared there). Run the following command: <pre>git remote set-url origin --push [email protected]:opencv.git</pre> to be able to push changes to the repository.
46 1
* That's it. You may try making some changes to commit and push them for the test run.