[PATCH 1/5] config: relax requirements on multi-value return

From: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Date: Sep 27, 2022, 14:08 UTC
Message-ID: <b2558a737f31465b38ad361a412d923ef186a38a.1664287711.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1369.git.1664287711.gitgitgadget@gmail.com>

From: Derrick Stolee <derrickstolee@github.com>

The git_configset_get_value() method has an assert() statement guaranteeing that the result from git_configset_get_value_multi() is either NULL or has at least one element. We want to change that return to provide an empty list instead of a NULL list, so change the earlier 'return 1' condition to care about a NULL or empty list.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
---
 config.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config.c b/config.c
index cbb5a3bab74..bf89afbdab0 100644
--- a/config.c
+++ b/config.c
@@ -2407,9 +2407,8 @@ int git_configset_get_value(struct config_set *cs, const char *key, const char *
 	 */
 	values = git_configset_get_value_multi(cs, key);
 
-	if (!values)
+	if (!values || !values->nr)
 		return 1;
-	assert(values->nr > 0);
 	*value = values->items[values->nr - 1].string;
 	return 0;
 }

-- 
gitgitgadget