Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes:
> On Sat, 8 Mar 2008, Simon Fraser wrote:
> >
> > However, I don't see a reliable way to identify the two files
> > from a "diff --git" line. Here's a (deliberately pathological)
> > example:
>
> See how "git-apply" does it.
>
> The rule is:
>
> - if the filenames are different, you should ignore the filenames on the
> "diff --git" line, and trust the ones on the "renamed from/to" ones
> (which are unambiguous because they only have one filename per line)
>
> - if the filenames aren't different, then you can unambiguously know how
> to parse it by simply making sure they are the same.
By the way, the default pre-commit hook behaves a bit strangely on
files which contain spaces[*1*] in filename (due to GNU-diff-uism):
*
* You have some suspicious patch lines:
*
* In b
* trailing whitespace (line 1)
b:1:++ b/ b
Foootnote:
==========
[*1*] If file has '"', '\' or control character in filename,
it is quoted.
--
Jakub Narebski
Poland
ShadeHawk on #git
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
