Re: Patches generated by "git format-patch -M -B" can't be applied with "git apply"?

2015-09-14 Thread Junio C Hamano
Dan Kegel writes: Yes, "diff -M -B" is known to be problematic, unfortunately. It incorrectly creates an irreversible patch under certain conditions. http://thread.gmane.org/gmane.linux.kernel/1879635 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: Patches generated by "git format-patch -M -B" can't be applied with "git apply"?

2015-09-14 Thread Junio C Hamano
Yes, "diff -M -B" is known to be problematic, unfortunately. It incorrectly creates an irreversible patch under certain conditions. http://thread.gmane.org/gmane.linux.kernel/1879635 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kerne

Re: patches

2005-09-09 Thread Jason Riedy
And Patrick Mauritz writes: - - --- git-core-0.99.5.orig/convert-cache.c Wed Aug 17 09:55:00 2005 - +++ git-core-0.99.5/convert-cache.c Wed Aug 17 09:58:48 2005 - @@ -1,4 +1,5 @@ - #define _XOPEN_SOURCE /* glibc2 needs this */ - +#define __EXTENSIONS__ /* solaris needs this */ To be h

Re: patches

2005-09-08 Thread Patrick Mauritz
On Thu, 2005-09-08 at 04:06, Junio C Hamano wrote: > I would have appreciated if you said "Solaris portability patch" > or somesuch on the subject line. sorry, of course you're right.. the #ifndef __sun was done because getdomainname() doesn't exist on solaris. (just for clarification) > Curious.

Re: patches

2005-09-07 Thread Junio C Hamano
Patrick Mauritz <[EMAIL PROTECTED]> writes: I would have appreciated if you said "Solaris portability patch" or somesuch on the subject line. > diff -ur git-core-0.99.4.orig/convert-cache.c git-core-0.99.4/convert-cache.c > --- git-core-0.99.5.orig/convert-cache.c Wed Aug 17 09:55:00 2005 >

Re: patches to support working without the object database

2005-07-08 Thread Junio C Hamano
Replying to myself... JCH> While you are at it, you might also want to add an option to JCH> write-blob to specify the type of the object you are hashing, so JCH> that would make [*1*]: JCH> git-write-blob [-n] [-t ] ... JCH> [Footnote] JCH> *1* I considered this instead: JCH> git-writ

Re: patches to support working without the object database

2005-07-08 Thread Bryan Larsen
Junio C Hamano wrote: "BL" == Bryan Larsen <[EMAIL PROTECTED]> writes: BL> Sometimes you may wish to keep an audit trail of what changed, where, BL> and by whom. You do not need to know the exact details of the change, BL> and the files are so large that keeping an extra copy of the data in B

Re: patches to support working without the object database

2005-07-08 Thread Junio C Hamano
> "BL" == Bryan Larsen <[EMAIL PROTECTED]> writes: BL> Sometimes you may wish to keep an audit trail of what changed, where, BL> and by whom. You do not need to know the exact details of the change, BL> and the files are so large that keeping an extra copy of the data in BL> the object databa