Merge branch 'ab/config-multi-and-nonbool'

[thirdparty/git.git] / pack-bitmap.c

diff --git a/pack-bitmap.c b/pack-bitmap.c
index ca7c81b5c9f2770daf79d4fe15b889ac4e8b5251..f8ab6be411d4dad3e37cb96acbff476ba7579441 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -2318,7 +2318,11 @@ int bitmap_is_midx(struct bitmap_index *bitmap_git)
 
 const struct string_list *bitmap_preferred_tips(struct repository *r)
 {
-       return repo_config_get_value_multi(r, "pack.preferbitmaptips");
+       const struct string_list *dest;
+
+       if (!repo_config_get_string_multi(r, "pack.preferbitmaptips", &dest))
+               return dest;
+       return NULL;
 }
 
 int bitmap_is_preferred_refname(struct repository *r, const char *refname)