diff options
author | Russell Belfer <arrbee@arrbee.com> | 2012-03-02 15:57:06 -0800 |
---|---|---|
committer | Russell Belfer <arrbee@arrbee.com> | 2012-03-02 15:57:06 -0800 |
commit | 529df4dfe54c61b40b96abbafb420e9034a1a4a8 (patch) | |
tree | c1edb253f24423360e200faa38c94a9a61d4ac8c /src | |
parent | e1bcc19110eb7d540dee92af489440dd2953b5d5 (diff) | |
download | libgit2-529df4dfe54c61b40b96abbafb420e9034a1a4a8.tar.gz |
Fixes for merge of filters branch
Diffstat (limited to 'src')
-rw-r--r-- | src/diff_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diff_output.c b/src/diff_output.c index 84935182d..5e7486ab8 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -93,9 +93,9 @@ static int set_file_is_binary_by_attr(git_repository *repo, git_diff_file *file) int error = git_attr_get(repo, file->path, "diff", &value); if (error != GIT_SUCCESS) return error; - if (value == GIT_ATTR_FALSE) + if (GIT_ATTR_FALSE(value)) file->flags |= GIT_DIFF_FILE_BINARY; - else if (value == GIT_ATTR_TRUE) + else if (GIT_ATTR_TRUE(value)) file->flags |= GIT_DIFF_FILE_NOT_BINARY; /* otherwise leave file->flags alone */ return error; |