Merge branch 'maint'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 27f24d3aafbee239301628a2649dca83fcd12081..a9c67c18ba159c8f04fa6bfff52ed9718965190a 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -770,7 +770,7 @@ static int no_try_delta(const char *path)
        struct git_attr_check check[1];
 
        setup_delta_attr_check(check);
-       if (git_checkattr(path, ARRAY_SIZE(check), check))
+       if (git_check_attr(path, ARRAY_SIZE(check), check))
                return 0;
        if (ATTR_FALSE(check->value))
                return 1;