# cg-mkpatch use case 5 messages from 2006-05-02 to 2006-05-02. Participants: Belmar-Letelier, Martin Langhoff, Petr Baudis. Thread: https://gitlist.dev/t/4021 ## Belmar-Letelier, 2006-05-02 07:47 Subject: cg-mkpatch use case Message-ID: <44570E8E.5070402@itaapy.com> URL: https://gitlist.dev/e/44570E8E.5070402%40itaapy.com ``` 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, 2006-05-02 21:41 Subject: Re: cg-mkpatch use case Message-ID: <46a038f90605021441t25152f7dtfed3828cd601b806@mail.gmail.com> URL: https://gitlist.dev/e/46a038f90605021441t25152f7dtfed3828cd601b806%40mail.gmail.com In-Reply-To: <44570E8E.5070402@itaapy.com> ``` On 5/2/06, Belmar-Letelier 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, 2006-05-02 21:57 Subject: Re: cg-mkpatch use case Message-ID: <20060502215703.GK27689@pasky.or.cz> URL: https://gitlist.dev/e/20060502215703.GK27689%40pasky.or.cz In-Reply-To: <44570E8E.5070402@itaapy.com> ``` Hi, Dear diary, on Tue, May 02, 2006 at 09:47:26AM CEST, I got a letter where Belmar-Letelier said that... > 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, 2006-05-02 22:19 Subject: Re: cg-mkpatch use case Message-ID: <46a038f90605021519x5ee680b0v78dd5c092e1b191f@mail.gmail.com> URL: https://gitlist.dev/e/46a038f90605021519x5ee680b0v78dd5c092e1b191f%40mail.gmail.com In-Reply-To: <20060502215703.GK27689@pasky.or.cz> ``` On 5/3/06, Petr Baudis 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, 2006-05-02 22:34 Subject: Re: cg-mkpatch use case Message-ID: <20060502223438.GH27631@pasky.or.cz> URL: https://gitlist.dev/e/20060502223438.GH27631%40pasky.or.cz In-Reply-To: <46a038f90605021519x5ee680b0v78dd5c092e1b191f@mail.gmail.com> ``` Dear diary, on Wed, May 03, 2006 at 12:19:00AM CEST, I got a letter where Martin Langhoff said that... > On 5/3/06, Petr Baudis 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. ```