Merge branch 'ab/free-and-null'

diff --git a/config.c b/config.c
index 6f0f8b30f39ba3a32d1a1795bdf12d78c5ea97f9..1cd40a5fe6802db723de0d0c78b7d316735e80b3 100644 (file)
--- a/config.c
+++ b/config.c
@@ -394,8 +394,7 @@ static int git_config_parse_key_1(const char *key, char **store_key, int *basele
 
 out_free_ret_1:
        if (store_key) {
-               free(*store_key);
-               *store_key = NULL;
+               FREE_AND_NULL(*store_key);
        }
        return -CONFIG_INVALID_KEY;
 }