Re: [gpsd-dev] Help on using git

[Beat Bolli]

On 26.10.13 04:15, Sanjeev Gupta wrote:
> Hi,
> 
> I have fed some changes to ESR by sending him diffs.  This works,
> because it uses tools I have been using for 20 years.  However, with the
> increasing use of git, it is becoming difficult to contribute in most
> OSS projects.
> 
> To start with, I cannot figure out how to get only one file from
> http://git.savannah.gnu.org/cgit/gpsd.git/
> to work on.

This is not possible with Git.

> I need to download the entire tree (which is not undoable,
> but I am on the Ubuntu 14.05 Trusty branch, and git is broken tonight).

A stable development environment is a prerequisite ;-) I use Debian
testing on a headless server for GPSD.

> So would anyone be willing to give me a cheat sheet, specific to the
> GPSD project?  Should I create an account on github?  Savannah?  I push
> from my laptop to github, ESR or Gary pulls from there?

I have a clone of git://git.savannah.nongnu.org/gpsd.git. When I want to
submit a patch or a patch series, I create a new branch:

git checkout -b <feature>

I develop, test and commit as many times as needed until the patches are
fine.

I have configured git so that git send-email works without prompts:

$ git config sendemail.from 'Beat Bolli <address@hidden>'
$ git config sendemail.to address@hidden
$ git config sendemail.chainreplyto true
$ git config sendemail.suppressfrom true

Then, assuming you have a local sendmail command that is connected to
the Internet, I send the commits from my branch to the dev mailing list
with the command

git send-email master

This creates one email for each commit that is on by feature branch with
the familiar [PATCH n/m] subject prefix.

On the receiving side, Gary or Eric reviews the patches, sign off on
them and apply them to their local repo with "git am" and finally push
the changes to Savannah.

When I pull from there and find my patches in the master branch, I
delete my private branch:

git branch -D <feature>

> I started out in coding 25 years ago using TDMA, you told people you
> would be working from 10pm till late on the tree, and others chose other
> times.  Since terminals were anyway limited, I do not recall ever having
> 3-way merge issues, or lock, or concurrency problems.  Ah, the good old
> days.

Yeah, progress has its price ;-) After using Git for a few months, this
will start to feel quite natural to you.

Beat
-- 
mail: echo '<address@hidden>' | tr -d '[A-S]'
pgp: 0x506A903A; 49D5 794A EA77 F907 764F  D89E 304B 93CF 506A 903A
gsm: 4.7.7.6.0.7.7.9.7.1.4.e164.arpa
icbm: 47.0452 N, 7.2715 E

"It takes love over gold, and mind over matter" -- Dire Straits

signature.asc
Description: OpenPGP digital signature