<div dir="ltr"><div class="gmail_quote"><br><div dir="ltr"><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif">Hi All,</span></p><p class="MsoNormal" style="margin-bottom:0.0001pt">
<span style="font-family:'Times New Roman',serif;font-size:12pt"> </span></p>
<p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif">This Tuesday I had another session
with Zeljko which was more on the usage of Git and Gerrit.</span><span style="font-size:12pt;font-family:'Times New Roman',serif"></span></p><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif">Please find below the details:</span><span style="font-family:'Times New Roman',serif;font-size:12pt"> </span></p>
<ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">Before
submitting any changes, make sure you first sync the local repository with
master by the command:</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></li>
</ul><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> <i>git pull origin master</i></span><span style="font-family:Garamond,serif;font-size:12pt"> </span></p>
<ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">Create
a branch at your local repo. If it’s a bug you are working on: You
might want to create a branch as Bug12345</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></li>
</ul><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> <i>git branch branchname</i></span><span style="font-family:Garamond,serif;font-size:12pt"> </span></p>
<ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">Switch
to the new branch</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></li>
</ul><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> <i>git checkout branchname</i></span><span style="font-family:Garamond,serif;font-size:12pt"> </span></p>
<ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">Make
changes to code on local repository in your branch. Create a new file or
delete files. Try to commit all in a single patch.</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></li>
</ul><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> </span><span style="font-size:7pt;font-family:Garamond,serif">
</span><span style="font-size:12pt;font-family:Garamond,serif">For adding a new file :</span><span style="font-size:12pt;font-family:'Times New Roman',serif"></span></p><p class="MsoNormal" style="margin-bottom:0.0001pt">
<span style="font-size:12pt;font-family:Garamond,serif"> <i>git add filename</i></span><span style="font-family:Garamond,serif;font-size:12pt"> </span></p><ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">Finally
commit the changes by:</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></li>
</ul><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif">
<i>commit -m "Commit Message"</i></span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></p><p class="MsoNormal" style="margin-left:1cm;margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> Guidelines
on how to write a good commit message can be found here: <a href="http://www.mediawiki.org/wiki/Gerrit/Commit_message_guidelines" target="_blank">http://www.mediawiki.org/wiki/Gerrit/Commit_message_guidelines</a></span><span style="font-size:12pt;font-family:Garamond,serif"> </span><span style="font-size:12pt;font-family:'Times New Roman',serif"></span></p>
<ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">Finally
to push the code </span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></li>
</ul><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> <i> git review</i></span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></p><ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">If
you wish to redo your changes:</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></li>
</ul><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> steps to be followed are:</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></p>
<p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif">
<i>git review -d changenumber</i> </span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></p><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> (d
option means download)</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></p><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif">
change number can be obtained: <a href="https://gerrit.wikimedia.org/r/#changenumber">https://gerrit.wikimedia.org/r/#changenumber</a></span><span style="font-size:12pt;font-family:Garamond,serif"> </span><span style="font-size:12pt;font-family:'Times New Roman',serif"></span></p>
<ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">Make
the changes and do</span></li>
</ul><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:Garamond,serif"> git add</span><span style="font-size:12pt;font-family:Arial,sans-serif"></span></p><p class="MsoNormal" style="margin-bottom:0.0001pt">
<span style="font-size:12pt;font-family:Garamond,serif">
(If required)</span><span style="font-family:Garamond,serif;font-size:12pt"> </span></p><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:'Times New Roman',serif"></span></p>
<ul type="disc">
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">Finally
commit :</span></li>
</ul><p class="MsoNormal" style="margin-left:18pt;text-indent:18pt"><span style="font-size:12pt;font-family:Garamond,serif">git commit --amend</span></p><p class="MsoNormal" style="margin-left:18pt;text-indent:18pt"><span style="font-size:12pt;font-family:Garamond,serif">Every time you amend your commit and submit it for review, a new patch
set is created</span><span style="font-family:Garamond,serif;font-size:12pt"> </span></p><p class="MsoNormal" style="margin-bottom:0.0001pt"><span style="font-size:12pt;font-family:'Times New Roman',serif"></span></p>
<ul type="disc">
<li class="MsoNormal"><span style="font-size:7pt;font-family:Garamond,serif"> </span><span style="font-size:12pt;font-family:Garamond,serif">After
submitting a patch it's very important to have a code review done. </span></li>
</ul><p class="MsoNormal" style="margin-left:36pt"><span style="font-size:12pt;font-family:Garamond,serif">We need to
add a reviewer from gerrit tool.</span></p><ul type="disc">
<ul type="circle">
<li class="MsoNormal"><font face="Garamond, serif" size="3">'Jenkins-bot'
is the auto reviewer which auto verifies the code submitted for initial
level checks and sees whether build passes Jenkins test.</font></li>
<li class="MsoNormal"><span style="font-size:12pt;font-family:Garamond,serif">We
have to manually add someone as reviewer in addition to our code being
checked by Jenkins bot. A gerrit code reviewer can rate our code
submitted as -2,-1,0,+1,+2. </span><span style="font-family:Garamond,serif;font-size:12pt"> -1 means code needs some minor work to be done,+2
means approved. A code reviewer can also abandon the changes.</span></li></ul></ul><div><font face="Garamond, serif" size="3"> </font><span style="font-family:Garamond,serif;font-size:16.363636016845703px">I am hoping to learn more on the usage of Git as I keep using it more.</span></div>
<div><span style="font-family:Garamond,serif;font-size:16.363636016845703px"> Thanks Zeljko for your guidance. Please do add to this if there are any errors here or if I have missed on something.</span></div><div><span style="font-family:Garamond,serif;font-size:16.363636016845703px"><br>
</span></div><div><span style="font-family:Garamond,serif;font-size:16.363636016845703px">Regards,</span></div><div><span style="font-family:Garamond,serif;font-size:16.363636016845703px">Jagori</span></div><p class="MsoNormal" style="margin-left:72pt">
<span style="font-size:12pt;font-family:Garamond,serif"> </span></p><p class="MsoNormal" style="margin:0cm 0cm 0.0001pt 54pt">
<br></p><p class="MsoNormal" style="margin:0cm 0cm 0.0001pt 54pt"><br></p><p class="MsoNormal" style="margin-bottom:0.0001pt">
</p><p class="MsoNormal"><span style="font-size:12pt;line-height:115%;font-family:Garamond,serif"> </span></p></div>
</div><br></div>