зеркало из https://github.com/microsoft/git.git
Fix 'diff' attribute semantics.
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:
Родитель
201ac8efc7
Коммит
40250af411
5
diff.c
5
diff.c
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче