proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 15:00:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for merge of filters branch

Browse Source
This commit is contained in:
Russell Belfer 2012-03-02 15:57:06 -08:00
parent e1bcc19110
commit 529df4dfe5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff_output.c
View File

@ -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); int error = git_attr_get(repo, file->path, "diff", &value);
if (error != GIT_SUCCESS) if (error != GIT_SUCCESS)
return error; return error;
if (value == GIT_ATTR_FALSE) if (GIT_ATTR_FALSE(value))
file->flags |= GIT_DIFF_FILE_BINARY; 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; file->flags |= GIT_DIFF_FILE_NOT_BINARY;
/* otherwise leave file->flags alone */ /* otherwise leave file->flags alone */
return error; return error;

1
tests-clar/attr/repo.c
View File

@ -67,6 +67,7 @@ void test_attr_repo__get_one(void)
}, *scan; }, *scan;
for (scan = test_cases; scan->path != NULL; 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)); cl_git_pass(git_attr_get(g_repo, scan->path, scan->attr, &value));
attr_check_expected(scan->expected, scan->expected_str, value); attr_check_expected(scan->expected, scan->expected_str, value);
} }