[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Which git tool should I use?

Paul Elliott <pelliott@blackpatchpanel.com> writes:

> I am currently packaging several programs for debian. I would like to
> store my VCS stuff publicly. I have been granted access to collab-maint.

> Although previously I used svn I have been persuaded to use git.

> I have spent the last week reading git manuals, but I am a beginner.

> What tool should I use to create my git info? git-dpm? StGit?

Personally, I would recommend that you not use any of those and just start
with straightforward Git, commiting your changes directly to master and
letting the packaging tools generate a single Debian diff.  This is by far
the simplest approach when you're new to git.

The other tools provide some interesting features in independently
tracking patches and can be useful when you're feeding those patches
upstream, but they're also much more complex to use and rely in some cases
on some complex uses of Git internals.  I would not recommend them to
someone who is brand new to Git, since they can be quite confusing until
you have a fairly good grasp of how Git works by itself.

I do recommend using git-buildpackage and its tools from the start,
including storing tarballs using pristine-tar, since that will get you
started on a good branch layout and workflow without really changing how
Git behaves (unlike the more complex patch management tools).

Later on, once you're familiar with Git and have a firmer grasp of the
tradeoffs, you can consider using one of the more complex overlay systems.

Russ Allbery (rra@debian.org)               <http://www.eyrie.org/~eagle/>

Reply to: