Fixes for merge of filters branch

diff --git a/src/diff_output.c b/src/diff_output.c
index 84935182d59a89620fa8c8d486b8ef5495fa06a3..5e7486ab8967fde984dab36e19612d8dbdebec05 100644 (file)
--- 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;

diff --git a/tests-clar/attr/repo.c b/tests-clar/attr/repo.c
index 2afea23d62ea4bf4455ef92eca6bf59fcdba203c..4de4afaa79da55349ce2e2bac89d5779468ae90f 100644 (file)
--- a/tests-clar/attr/repo.c
+++ b/tests-clar/attr/repo.c
@@ -67,6 +67,7 @@ void test_attr_repo__get_one(void)
        }, *scan;
 
        for (scan = test_cases; scan->path != NULL; scan++) {
+               const char *value;
                cl_git_pass(git_attr_get(g_repo, scan->path, scan->attr, &value));
                attr_check_expected(scan->expected, scan->expected_str, value);
        }