From: Junio C Hamano <junkio@cox.net>
Date: Sun, 15 Apr 2007 21:35:11 +0000 (-0700)
Subject: Fix 'diff' attribute semantics.
X-Git-Tag: v1.5.2-rc0~18^2~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=40250af411f33afa0c39a5d461829b676453ce3b;p=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>
---

diff --git a/diff.c b/diff.c
index e4efb657e..dcea405ed 100644
--- a/diff.c
+++ b/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;