mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-20 14:24:12 +01:00
Code

Fix 'diff' attribute semantics.

Browse Source 
This is in the same spirit as the previous one.  Earlier 'diff'
meant 'do the built-in binary heuristics and disable patch text
generation based on it' while '!diff' meant 'do not guess, do
not generate patch text'.  There was no way to say 'do generate
patch text even when the heuristics says it has NUL in it'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-04-15 14:35:11 -07:00
parent 201ac8efc7
commit 40250af411
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diff.c
View File

@ -1069,8 +1069,9 @@ static int file_is_binary(struct diff_filespec *one)
setup_diff_attr_check(&attr_diff_check);
if (!git_checkattr(one->path, 1, &attr_diff_check) &&
(0 == attr_diff_check.isset))
return 1;
(0 <= attr_diff_check.isset))
return !attr_diff_check.isset;
if (!one->data) {
if (!DIFF_FILE_VALID(one))
return 0;