Re: stGIT: commit vs export vs mail

["Catalin Marinas" <catalin.marinas@gmail.com>]

On 18/02/06, Jesse Brandeburg <jesse.brandeburg@intel.com> wrote:
> On Fri, 17 Feb 2006, Catalin Marinas wrote:
> > Jesse Brandeburg wrote:
> >> stg mail <blah blah blah>
> >> or
> >> stg commit
> >
>
> I'm trying to commit changes to a local repository so that the maintainer
> can do a "pull" off of my repository.

All the applied patches in your repository are visible via HEAD. There
is no need to do a commit, unless you want to store them permanently.
The way of using StGIT in contributor mode is to always have the base
of the stack identical to the HEAD of the upstream repository.

I usually just mail the patches but the other way would be to apply
the patches you want to be merged and ask the maintainer to pull from
it. Once the changes were pulled, you could run 'stg pull' on your
repository and StGIT should detect which patches were merged and
whether there are any conflicts (patches modified upstream for
example).

If you want to continue the work on your branch before the maintainer
would pull the changes, you can create a separate "stable" branch for
this. Either use 'stg branch --clone' or simply create it with 'stg
branch --create base' and pick the patches you want merged.

> the stgit command stg commit freezes patches that I've made into my
> repository.  I think I get that, but I've been wrong before.  Its just
> that I can template the Signed-off-by: line for emails, but when I do a
> stg commit I want the thing to have the Signed-off-by: line in the commit
> text (like above where I added it by hand)
>
> I guess I'll just change my templates to not auto add the Signed-off-by
> line and then things will work okay, as I'll just add the line during stg
> new ...

I got it now. You added Signed-off-by to the mail template. As I said
above, commit should not be used to facilitate the maintainer pulling.
It is already available since the patches are valid GIT commits.

--
Catalin