Re: when is "git diff" output suitable for patch?
On Thu, Jul 13, 2006 at 02:27:33PM -0700, Junio C Hamano wrote:
Show 9 quoted lines
> "J. Bruce Fields" <bfields@fieldses.org> 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.
Show 6 quoted lines
> > 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 <junkio@cox.net>
Date: Sat Mar 11 17:44:10 2006 -0800
git-diff: -p disables rename detection.
--b.