From cf286d5e0e604fd25c67c138ca5a3cd880a7e892 Mon Sep 17 00:00:00 2001 From: Laurence McGlashan Date: Thu, 12 Dec 2019 10:58:56 +0000 Subject: [PATCH] attr: Update definition of binary macro --- src/attrcache.c | 2 +- tests/attr/macro.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/attrcache.c b/src/attrcache.c index b85202bb1..21a1fea24 100644 --- a/src/attrcache.c +++ b/src/attrcache.c @@ -403,7 +403,7 @@ int git_attr_cache__init(git_repository *repo) git_config_free(cfg); /* insert default macros */ - return git_attr_add_macro(repo, "binary", "-diff -crlf -text"); + return git_attr_add_macro(repo, "binary", "-diff -merge -text -crlf"); cancel: attr_cache__free(cache); diff --git a/tests/attr/macro.c b/tests/attr/macro.c index ef9784141..1fbfd137f 100644 --- a/tests/attr/macro.c +++ b/tests/attr/macro.c @@ -20,20 +20,22 @@ void test_attr_macro__cleanup(void) void test_attr_macro__macros(void) { - const char *names[5] = { "rootattr", "binary", "diff", "crlf", "frotz" }; + const char *names[7] = { "rootattr", "binary", "diff", "crlf", "merge", "text", "frotz" }; const char *names2[5] = { "mymacro", "positive", "negative", "rootattr", "another" }; const char *names3[3] = { "macro2", "multi2", "multi3" }; - const char *values[5]; + const char *values[7]; g_repo = cl_git_sandbox_init("attr"); - cl_git_pass(git_attr_get_many(values, g_repo, 0, "binfile", 5, names)); + cl_git_pass(git_attr_get_many(values, g_repo, 0, "binfile", 7, names)); cl_assert(GIT_ATTR_IS_TRUE(values[0])); cl_assert(GIT_ATTR_IS_TRUE(values[1])); cl_assert(GIT_ATTR_IS_FALSE(values[2])); cl_assert(GIT_ATTR_IS_FALSE(values[3])); - cl_assert(GIT_ATTR_IS_UNSPECIFIED(values[4])); + cl_assert(GIT_ATTR_IS_FALSE(values[4])); + cl_assert(GIT_ATTR_IS_FALSE(values[5])); + cl_assert(GIT_ATTR_IS_UNSPECIFIED(values[6])); cl_git_pass(git_attr_get_many(values, g_repo, 0, "macro_test", 5, names2));