[OpenAFS-devel] Git/gerrit basics (Windows)
Mickey Lane
mickeylane33540@gmail.com
Thu, 16 Jul 2009 12:40:45 -0400
This is a multi-part message in MIME format.
------=_NextPart_000_000B_01CA0612.A4C4F670
Content-Type: text/plain;
charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Git/gerrit basics (Windows)
I'd like to submit two trivial changes for the kdfs branch. They're only
appropriate to that branch. My main goal is really to learn the git/gerrit
process.
I plan to make one change, commit and submit. Then make the second change
and repeat the process.
Some really basic questions:
#1
My two changes don't have anything to do with each other but by following
the above process, do I establish a dependency so that the 1st change must
be applied (approved?) before the 2nd?
#2
From:
http://www.dementia.org/twiki/bin/view/AFSLore/GitDevelopers
Uploading to gerrit
-------------------
[...]
Secondly, each commit should have a meaningful revision log. The internals
of git means that we can't easily edit these before pushing them into the
tree, so we'd like you to get them right for us! A commit message should be
comprised of a single 'subject' line (which must not end with a full stop),
followed by a blank line, followed by one or more paragraphs explaining the
purpose of the patch. If it is intended to fix a bug in OpenAFS RT, then the
word 'FIXES' followed by the bug number or comma-separated list of bug
numbers should be included on a line of its own. The 'LICENSE' keyword can
be used to indicate code which is covered under a license other than the
IPL, although please speak to a gatekeeper if you intend using this. An
example commit message would be
Add option to disable syscall probing
This adds the --disable-linux-syscall-probing to allow the probing of
kernel memory for the syscall table to be disabled at compile time. This
helps with Linux architectures which have compile, run or load time
issues with syscall probing by providing a band-aid fix until we can
improve the configuration logic in this area.
The phrase "must not end with a full stop" is confusing to Windows users.
(This one anyway)
If I make a text file (a.txt) with the above as a guide (on Windows, it'll
have <carriage return><line feed>) and supply it to my commit command (in
the bash window from msysGit):
git commit -F a.txt
Will that work?
(Minor comment wrt the web page - it took me some time to realize that the
above text - under the heading 'upload to gerrit' - is actually part of the
git commit activity and doesn't really have anything to do with upload. I
had assumed it was something added via a gerrit form presented at the time
of commit. Perhaps add some text to put it in context?)
#3
I have given the Gerrit server my SSH public key but I'm not sure how
msysGit and/or PuTTY and/or ???? is supposed to be configured to make all
this work.
#4
If the commit stuff works, do I immediately follow that with:
git log -p origin/openafs-windows-kdfs-ifs-branch..HEAD
git push ssh://gerrit.openafs.org/openafs.git
HEAD:refs/for/openafs-windows-kdfs-ifs-branch
#5
If the push completes without apparent error, is that the end of the
process?
Regards,
Mickey.
------=_NextPart_000_000B_01CA0612.A4C4F670
Content-Type: text/html;
charset="US-ASCII"
Content-Transfer-Encoding: quoted-printable
<html xmlns:v=3D"urn:schemas-microsoft-com:vml" =
xmlns:o=3D"urn:schemas-microsoft-com:office:office" =
xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" =
xmlns=3D"http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=3DContent-Type content=3D"text/html; =
charset=3Dus-ascii">
<meta name=3DGenerator content=3D"Microsoft Word 12 (filtered medium)">
<style>
<!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;}
@page Section1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.Section1
{page:Section1;}
-->
</style>
<!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=3DEN-US link=3Dblue vlink=3Dpurple>
<div class=3DSection1>
<p class=3DMsoNormal>Git/gerrit basics (Windows)<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>I'd like to submit two trivial changes for the kdfs =
branch.
They're only appropriate to that branch. My main goal is really to learn =
the
git/gerrit process.<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>I plan to make one change, commit and submit. Then =
make the
second change and repeat the process.<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>Some really basic questions:<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>#1<o:p></o:p></p>
<p class=3DMsoNormal>My two changes don't have anything to do with each =
other but
by following the above process, do I establish a dependency so that the =
1st
change must be applied (approved?) before the 2nd?<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>#2<o:p></o:p></p>
<p class=3DMsoNormal>From:<o:p></o:p></p>
<p =
class=3DMsoNormal>http://www.dementia.org/twiki/bin/view/AFSLore/GitDevel=
opers<o:p></o:p></p>
<p class=3DMsoNormal>Uploading to gerrit<o:p></o:p></p>
<p class=3DMsoNormal>-------------------<o:p></o:p></p>
<p class=3DMsoNormal>[...]<o:p></o:p></p>
<p class=3DMsoNormal>Secondly, each commit should have a meaningful =
revision log.
The internals of git means that we can't easily edit these before =
pushing them
into the tree, so we'd like you to get them right for us! A commit =
message
should be comprised of a single 'subject' line (which must not end with =
a full
stop), followed by a blank line, followed by one or more paragraphs =
explaining
the purpose of the patch. If it is intended to fix a bug in OpenAFS RT, =
then
the word 'FIXES' followed by the bug number or comma-separated list of =
bug
numbers should be included on a line of its own. The 'LICENSE' keyword =
can be
used to indicate code which is covered under a license other than the =
IPL,
although please speak to a gatekeeper if you intend using this. An =
example
commit message would be<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal> Add option to disable syscall =
probing<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal> This adds the =
--disable-linux-syscall-probing to
allow the probing of <o:p></o:p></p>
<p class=3DMsoNormal> kernel memory for the syscall table to be =
disabled at
compile time. This<o:p></o:p></p>
<p class=3DMsoNormal> helps with Linux architectures which have =
compile,
run or load time <o:p></o:p></p>
<p class=3DMsoNormal> issues with syscall probing by providing a =
band-aid
fix until we can<o:p></o:p></p>
<p class=3DMsoNormal> improve the configuration logic in this =
area.<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>The phrase "must not end with a full =
stop" is
confusing to Windows users. (This one anyway)<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>If I make a text file (a.txt) with the above as a =
guide (on
Windows, it'll have <carriage return><line feed>) and supply =
it to
my commit command (in the bash window from msysGit):<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p =
class=3DMsoNormal> &=
nbsp; git
commit -F a.txt<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>Will that work?<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>(Minor comment wrt the web page - it took me some =
time to
realize that the above text - under the heading 'upload to gerrit' - is
actually part of the git commit activity and doesn't really have =
anything to do
with upload. I had assumed it was something added via a gerrit form =
presented
at the time of commit. Perhaps add some text to put it in =
context?)<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>#3<o:p></o:p></p>
<p class=3DMsoNormal>I have given the Gerrit server my SSH public key =
but I'm not
sure how msysGit and/or PuTTY and/or ???? is supposed to be configured =
to make
all this work.<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>#4<o:p></o:p></p>
<p class=3DMsoNormal>If the commit stuff works, do I immediately follow =
that
with:<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p =
class=3DMsoNormal> &=
nbsp; git
log -p origin/openafs-windows-kdfs-ifs-branch..HEAD<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p =
class=3DMsoNormal> &=
nbsp; git
push ssh://gerrit.openafs.org/openafs.git
HEAD:refs/for/openafs-windows-kdfs-ifs-branch<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>#5<o:p></o:p></p>
<p class=3DMsoNormal>If the push completes without apparent error, is =
that the
end of the process?<o:p></o:p></p>
<p class=3DMsoNormal><o:p> </o:p></p>
<p class=3DMsoNormal>Regards,<o:p></o:p></p>
<p class=3DMsoNormal>Mickey.<o:p></o:p></p>
</div>
</body>
</html>
------=_NextPart_000_000B_01CA0612.A4C4F670--