t1007: add hash-object --literally tests

diff --git a/config.c b/config.c
index 8449a8ac450550372b0b17d3e0d5f63d3d159a70..83c913ad0928aba882a86f361170cd256adbd445 100644 (file)
--- a/config.c
+++ b/config.c
@@ -35,12 +35,6 @@ struct config_source {
        long (*do_ftell)(struct config_source *c);
 };
 
-struct config_set_element {
-       struct hashmap_entry ent;
-       char *key;
-       struct string_list value_list;
-};
-
 static struct config_source *cf;
 
 static int zlib_compression_seen;
@@ -177,19 +171,27 @@ void git_config_push_parameter(const char *text)
 int git_config_parse_parameter(const char *text,
                               config_fn_t fn, void *data)
 {
+       const char *value;
        struct strbuf **pair;
+
        pair = strbuf_split_str(text, '=', 2);
        if (!pair[0])
                return error("bogus config parameter: %s", text);
-       if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=')
+
+       if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=') {
                strbuf_setlen(pair[0], pair[0]->len - 1);
+               value = pair[1] ? pair[1]->buf : "";
+       } else {
+               value = NULL;
+       }
+
        strbuf_trim(pair[0]);
        if (!pair[0]->len) {
                strbuf_list_free(pair);
                return error("bogus config parameter: %s", text);
        }
        strbuf_tolower(pair[0]);
-       if (fn(pair[0]->buf, pair[1] ? pair[1]->buf : NULL, data) < 0) {
+       if (fn(pair[0]->buf, value, data) < 0) {
                strbuf_list_free(pair);
                return -1;
        }
@@ -842,14 +844,12 @@ static int git_default_core_config(const char *var, const char *value)
                return git_config_string(&editor_program, var, value);
 
        if (!strcmp(var, "core.commentchar")) {
-               const char *comment;
-               int ret = git_config_string(&comment, var, value);
-               if (ret)
-                       return ret;
-               else if (!strcasecmp(comment, "auto"))
+               if (!value)
+                       return config_error_nonbool(var);
+               else if (!strcasecmp(value, "auto"))
                        auto_comment_line_char = 1;
-               else if (comment[0] && !comment[1]) {
-                       comment_line_char = comment[0];
+               else if (value[0] && !value[1]) {
+                       comment_line_char = value[0];
                        auto_comment_line_char = 0;
                } else
                        return error("core.commentChar should only be one character");
@@ -1232,7 +1232,7 @@ int git_config_with_options(config_fn_t fn, void *data,
        return ret;
 }
 
-void git_config(config_fn_t fn, void *data)
+static void git_config_raw(config_fn_t fn, void *data)
 {
        if (git_config_with_options(fn, data, NULL, 1) < 0)
                /*
@@ -1249,6 +1249,33 @@ void git_config(config_fn_t fn, void *data)
                die(_("unknown error occured while reading the configuration files"));
 }
 
+static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
+{
+       int i, value_index;
+       struct string_list *values;
+       struct config_set_element *entry;
+       struct configset_list *list = &cs->list;
+       struct key_value_info *kv_info;
+
+       for (i = 0; i < list->nr; i++) {
+               entry = list->items[i].e;
+               value_index = list->items[i].value_index;
+               values = &entry->value_list;
+               if (fn(entry->key, values->items[value_index].string, data) < 0) {
+                       kv_info = values->items[value_index].util;
+                       git_die_config_linenr(entry->key, kv_info->filename, kv_info->linenr);
+               }
+       }
+}
+
+static void git_config_check_init(void);
+
+void git_config(config_fn_t fn, void *data)
+{
+       git_config_check_init();
+       configset_iter(&the_config_set, fn, data);
+}
+
 static struct config_set_element *configset_find_element(struct config_set *cs, const char *key)
 {
        struct config_set_element k;
@@ -1275,6 +1302,7 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
 {
        struct config_set_element *e;
        struct string_list_item *si;
+       struct configset_list_item *l_item;
        struct key_value_info *kv_info = xmalloc(sizeof(*kv_info));
 
        e = configset_find_element(cs, key);
@@ -1290,6 +1318,12 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
                hashmap_add(&cs->config_hash, e);
        }
        si = string_list_append_nodup(&e->value_list, value ? xstrdup(value) : NULL);
+
+       ALLOC_GROW(cs->list.items, cs->list.nr + 1, cs->list.alloc);
+       l_item = &cs->list.items[cs->list.nr++];
+       l_item->e = e;
+       l_item->value_index = e->value_list.nr - 1;
+
        if (cf) {
                kv_info->filename = strintern(cf->name);
                kv_info->linenr = cf->linenr;
@@ -1313,6 +1347,9 @@ void git_configset_init(struct config_set *cs)
 {
        hashmap_init(&cs->config_hash, (hashmap_cmp_fn)config_set_element_cmp, 0);
        cs->hash_initialized = 1;
+       cs->list.nr = 0;
+       cs->list.alloc = 0;
+       cs->list.items = NULL;
 }
 
 void git_configset_clear(struct config_set *cs)
@@ -1329,6 +1366,10 @@ void git_configset_clear(struct config_set *cs)
        }
        hashmap_free(&cs->config_hash, 1);
        cs->hash_initialized = 0;
+       free(cs->list.items);
+       cs->list.nr = 0;
+       cs->list.alloc = 0;
+       cs->list.items = NULL;
 }
 
 static int config_set_callback(const char *key, const char *value, void *cb)
@@ -1447,7 +1488,7 @@ static void git_config_check_init(void)
        if (the_config_set.hash_initialized)
                return;
        git_configset_init(&the_config_set);
-       git_config(config_set_callback, &the_config_set);
+       git_config_raw(config_set_callback, &the_config_set);
 }
 
 void git_config_clear(void)