# when is "git diff" output suitable for patch? 5 messages from 2006-07-13 to 2006-07-13. Participants: J. Bruce Fields, Junio C Hamano. Thread: https://gitlist.dev/t/4876 ## J. Bruce Fields, 2006-07-13 21:21 Subject: when is "git diff" output suitable for patch? Message-ID: <20060713212127.GA30770@fieldses.org> URL: https://gitlist.dev/e/20060713212127.GA30770%40fieldses.org ``` I assume the -C and -M, -c, and -cc options all result in diff output that can't be correctly applied by "patch" any more? (Would a patch to the git-diff-files documentation warning about this be helpful?) Someone I'm working with is having trouble applying patches that they created with a simple "git diff". The patches in question have some "copy from/copy to" headers. Should that every happen with just a plain "git diff"? Is this a bug in their version of git? (They're on 1.2.4). --b. ``` ## Junio C Hamano, 2006-07-13 21:27 Subject: Re: when is "git diff" output suitable for patch? Message-ID: <7vhd1lurei.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vhd1lurei.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20060713212127.GA30770@fieldses.org> ``` "J. Bruce Fields" writes: > I assume the -C and -M, -c, and -cc options all result in diff output > that can't be correctly applied by "patch" any more? (Would a patch to > the git-diff-files documentation warning about this be helpful?) May not be bad to have, except that I do not know if "git-diff-files" documentation is the right place to talk about it. > Someone I'm working with is having trouble applying patches that they > created with a simple "git diff". The patches in question have some > "copy from/copy to" headers. Should that every happen with just a plain > "git diff"? Is this a bug in their version of git? (They're on 1.2.4). As far as I recall "git diff" never defaulted to -M. These days you can have diff.renames = true in the configuration to make it so, but and I do not think there was any way to do that back in 1.2.4. If _they_ created the diff with git, and if that is the same _they_ who are having trouble applying, maybe you can suggest to use "git apply" instead of "patch -p1"? ``` ## J. Bruce Fields, 2006-07-13 21:31 Subject: Re: when is "git diff" output suitable for patch? Message-ID: <20060713213116.GK19366@fieldses.org> URL: https://gitlist.dev/e/20060713213116.GK19366%40fieldses.org In-Reply-To: <7vhd1lurei.fsf@assigned-by-dhcp.cox.net> ``` On Thu, Jul 13, 2006 at 02:27:33PM -0700, Junio C Hamano wrote: > "J. Bruce Fields" writes: > > > I assume the -C and -M, -c, and -cc options all result in diff output > > that can't be correctly applied by "patch" any more? (Would a patch to > > the git-diff-files documentation warning about this be helpful?) > > May not be bad to have, except that I do not know if > "git-diff-files" documentation is the right place to talk about > it. OK. > > Someone I'm working with is having trouble applying patches that they > > created with a simple "git diff". The patches in question have some > > "copy from/copy to" headers. Should that every happen with just a plain > > "git diff"? Is this a bug in their version of git? (They're on 1.2.4). > > As far as I recall "git diff" never defaulted to -M. Hm. Is this related?: commit 42efbf6d8a5b4902c55a2f6e96034625c056ba1f Author: Junio C Hamano Date: Sat Mar 11 17:44:10 2006 -0800 git-diff: -p disables rename detection. --b. ``` ## Junio C Hamano, 2006-07-13 21:51 Subject: Re: when is "git diff" output suitable for patch? Message-ID: <7v3bd5uqav.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v3bd5uqav.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20060713213116.GK19366@fieldses.org> ``` "J. Bruce Fields" writes: >> As far as I recall "git diff" never defaulted to -M. > > Hm. Is this related?: > > commit 42efbf6d8a5b4902c55a2f6e96034625c056ba1f > Author: Junio C Hamano > Date: Sat Mar 11 17:44:10 2006 -0800 > > git-diff: -p disables rename detection. Ah, sorry, it _did_ default to -M; it was in such an ancient past and the shell wrapper wasn't initially done by me, so I misremembered. ``` ## J. Bruce Fields, 2006-07-13 21:53 Subject: Re: when is "git diff" output suitable for patch? Message-ID: <20060713215313.GO19366@fieldses.org> URL: https://gitlist.dev/e/20060713215313.GO19366%40fieldses.org In-Reply-To: <7v3bd5uqav.fsf@assigned-by-dhcp.cox.net> ``` On Thu, Jul 13, 2006 at 02:51:20PM -0700, Junio C Hamano wrote: > "J. Bruce Fields" writes: > > >> As far as I recall "git diff" never defaulted to -M. > > > > Hm. Is this related?: > > > > commit 42efbf6d8a5b4902c55a2f6e96034625c056ba1f > > Author: Junio C Hamano > > Date: Sat Mar 11 17:44:10 2006 -0800 > > > > git-diff: -p disables rename detection. > > Ah, sorry, it _did_ default to -M; it was in such an ancient > past and the shell wrapper wasn't initially done by me, so I > misremembered. Perfectly understandable; thanks for the help.--b. ```