Re: stGIT: commit vs export vs mail

From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Feb 18, 2006, 02:11 UTC
Message-ID: <Pine.WNT.4.63.0602171802030.2172@jbrandeb-desk.amr.corp.intel.com>
In-Reply-To: <43F64A51.10607@gmail.com>

On Fri, 17 Feb 2006, Catalin Marinas wrote:

Show 22 quoted lines

> Jesse Brandeburg wrote:
>> So I am using stgit .8 right now, and I'm having a hard time figuring
>> out what the correct workflow should be for using stg and then
>> committing a change
>>
>> Here is what I've been doing:
>> stg new test
>>  enter my short description on first line
>>  enter my long description on next lines.
>> vi file
>> stg refresh
>> stg mail <blah blah blah>
>> or
>> stg commit
>
> There is no "or" above but only "and maybe". The 'commit' command is
> only used to permanently store a set of patches into the repository.
> After that, you should not be able to change them anymore (well, someone
> just sent me a patch for an uncommit command). I only use this command
> when I work in the "maintainer" mode on StGIT. For contributing patches,
> you shouldn't need it since the base of the stack should usually be
> identical to the HEAD of the remote repository.

I'm trying to commit changes to a local repository so that the maintainer can do a "pull" off of my repository.

>> Problem that I'm having right now is that the templates do the right
>> thing for mail, but, the commit only puts in the "enter my..." text.
>
> I don't fully understand this. Where does commit put the "enter my..." text?

so I used stgit to commit this change. It puts it in the git log of checkins for the repository.

[jbrandeb@lindenhurst-2 e1000]$ git log | head -n 20

commit fb16b7111dae51b9a928aa7706d1cc022df8741d
Author: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date:   Fri Feb 17 11:29:19 2006 -0800

     e1000: update readme
     Update the e1000 text to the latest version

     Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>

Show 5 quoted lines

>> Is there a template based way to automatically append the author in the
>> Signed-off-by: line when i do stg commit?
>
> This can only be done when creating a patch. Commit doesn't modify the
> patches. I think you slightly misunderstood the commit command.

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 ...

Thanks for your reply, and the cool tool!

Jesse