Merge branch 'sb/string-list-remove-unused' into maint

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index ad3c650c08a2390a6e6fdebc05bd5bd7019f5664..2eba0a695b29874a4b002c08403847a67496726c 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -951,8 +951,7 @@ static int no_try_delta(const char *path)
 
        if (!check)
                check = attr_check_initl("delta", NULL);
-       if (git_check_attr(&the_index, path, check))
-               return 0;
+       git_check_attr(&the_index, path, check);
        if (ATTR_FALSE(check->items[0].value))
                return 1;
        return 0;