threads / discuss / 4021

cg-mkpatch use case

Subject: cg-mkpatch use case

## tl;dr

5 messages between May 2, 2006 and May 2, 2006.

replies: 4people: 3as markdown or json

Belmar-Letelier· May 2, 2006, 07:47 UTC · lore
Hello,
I have 3 questions about cg-mkpatch
1. I've receive a file "xxx.patch", this content came from
   cg-mkpatch, but I can't apply it.
   For example if I try git-am I get::
     $ git-am --signoff xxx.patch
     Patch does not have a valid e-mail address.
   What is the Cogito way to apply the result of "cg-mkpatch"
2. What are the difference between usecases with "cg-mkpatch"
   and "git-format-patch" ?
3. It seem that if a commit as a binary file they are no way to manage
   it by email patches. Any plan about this in Cogito ?
-- 
Luis
Martin Langhoff· May 2, 2006, 21:41 UTC · re: Belmar-Letelier · lore

Re: cg-mkpatch use case

On 5/2/06, Belmar-Letelier <luis@itaapy.com> wrote:
>    What is the Cogito way to apply the result of "cg-mkpatch"

AFAIK, cg-patch. However, cg-mkpatch appeared before cg-patch, so you may have a version of Cogito without cg-patch.

> 2. What are the difference between usecases with "cg-mkpatch"
>    and "git-format-patch" ?
If you are familiar with git tools, use them instead of cg tools ;-)

Cg is simpler, so if you have relatively simple needs, or a team with simple needs that doesn't need to know all the git tricks and internals, it can be a timesaver. In my team, people start with Cg and eventually evolve into using more and more of git.

cheers,
martin
Petr Baudis· May 2, 2006, 21:57 UTC · re: Belmar-Letelier · lore

Re: cg-mkpatch use case

  Hi,

Dear diary, on Tue, May 02, 2006 at 09:47:26AM CEST, I got a letter where Belmar-Letelier <luis@itaapy.com> said that...

Show 10 quoted lines
> I have 3 questions about cg-mkpatch
> 
> 1. I've receive a file "xxx.patch", this content came from
>   cg-mkpatch, but I can't apply it.
>   For example if I try git-am I get::
> 
>     $ git-am --signoff xxx.patch
>     Patch does not have a valid e-mail address.
> 
>   What is the Cogito way to apply the result of "cg-mkpatch"
  cg-mkpatch is a very old tool which has been long neglected and
not many people actually use it nowadays, I believe. You can apply it
back using cg-patch (or even patch itself, or git-apply if you are
lucky), but it won't automagically extract the commit message and
authorship information.
> 2. What are the difference between usecases with "cg-mkpatch"
>   and "git-format-patch" ?
  git-format-patch outputs stuff in the mailbox format while cg-mkpatch
outputs it in a more "human readable" (well, but quite historical)
format, but really, you probably want to use git-format-patch in almost
every case. In the (probably relatively near) future, cg-mkpatch might
become merely a git-format-patch wrapper.
> 3. It seem that if a commit as a binary file they are no way to manage
>   it by email patches. Any plan about this in Cogito ?
  Not any clear plans. I will welcome patches but it is not high
priority for me currently.
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time.  I think
I have forgotten this before.
Martin Langhoff· May 2, 2006, 22:19 UTC · re: Petr Baudis · lore

Re: cg-mkpatch use case

On 5/3/06, Petr Baudis <pasky@suse.cz> wrote:
> not many people actually use it nowadays, I believe. You can apply it
> back using cg-patch (or even patch itself, or git-apply if you are
> lucky), but it won't automagically extract the commit message and
> authorship information.
Erm... I don't personally use it, but cg-patch --long-help tells me...
-c::
        Automatically extract the commit message and authorship information
        (if provided) from the patch and commit it after applying it
        successfuly.
Truth in advertising? ;-)
cheers,
martin
Petr Baudis· May 2, 2006, 22:34 UTC · re: Martin Langhoff · lore

Re: cg-mkpatch use case

Dear diary, on Wed, May 03, 2006 at 12:19:00AM CEST, I got a letter where Martin Langhoff <martin.langhoff@gmail.com> said that...

Show 14 quoted lines
> On 5/3/06, Petr Baudis <pasky@suse.cz> wrote:
> >not many people actually use it nowadays, I believe. You can apply it
> >back using cg-patch (or even patch itself, or git-apply if you are
> >lucky), but it won't automagically extract the commit message and
> >authorship information.
> 
> Erm... I don't personally use it, but cg-patch --long-help tells me...
> 
> -c::
>        Automatically extract the commit message and authorship information
>        (if provided) from the patch and commit it after applying it
>        successfuly.
> 
> Truth in advertising? ;-)

Uhm, no, it just didn't stick in my mind in the storm of cg-patch improvements. :-) Oops.

So, YES, there IS a way to apply cg-mkpatches preserving autorship and everything - cg-patch -c. Sorry for the confusion. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time.  I think
I have forgotten this before.

← back to recent threads