提交 40250af4 编写于 作者: J Junio C Hamano

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: NJunio C Hamano <junkio@cox.net>
上级 201ac8ef
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册