Re: git commits to Systemtap

[David Smith <dsmith at redhat dot com>]

Dave Nomura wrote:
> I am ready to make my first git commits to Systemtap.  Could you tell me
> the procedure that you follow for doing this?
> 
> I am new to git so the full command syntax would be helpful.

First, read the git tutorial to get a feel for what you are about to do:
<http://www.kernel.org/pub/software/scm/git/docs/v1.4.4.4/tutorial.html>

Here are the basic steps:

1: Checkout the source (corresponds to "cvs co"):

# git clone ssh://sources.redhat.com/git/systemtap.git
(note that using the ssh protocol assumes you have a sources.redhat.com
account)

2: Make your code changes.  To see which files have been changed, do the
following (corresponds to "cvs -nq update"):

# git status

To see actual differences between what you started with and what you
have now, do the following (corresponds to "cvs diff"):

# git diff

3: Assuming you are happy with your changes, check them in (corresponds
to "cvs ci"):

# git commit -a

When it asks for a comment, I've typically been pasting in the ChangeLog
entries.  The first line of your comment should be a one-line
description of your change.

4: Step 3 checked your changes in locally.  Now we need to push them
back to the server so that others can see your changes.

# git push

It is possible that the push will fail at this point, which means that
someone else has made a change since you did your clone.  In this case,
you'll need to to update your local repository (and resolve any merge
conflicts), like this (corresponds to "cvs update"):

# git pull

Once the pull succeeds, try the "git push" again.

Hopefully I've covered the basics here.

-- 
David Smith
dsmith@redhat.com
Red Hat
http://www.redhat.com
256.217.0141 (direct)
256.837.0057 (fax)