[PATCH] Fix 'diff' attribute semantics.
- From
Junio C Hamano <junkio@cox.net>
- Date
- Apr 15, 2007, 23:12 UTC
- Message-ID
- <7vlkgt1bck.fsf_-_@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7vr6ql1ben.fsf@assigned-by-dhcp.cox.net>
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> --- * And this is a companion patch to 'crlf' one.
diff.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c index e4efb65..dcea405 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;
-- 1.5.1.1.815.g3e763