rugged 0.27.7 → 0.27.9

data/vendor/libgit2/src/commit.c

@@ -11,7 +11,6 @@
 #include "git2/object.h"
 #include "git2/repository.h"
 #include "git2/signature.h"
-#include "git2/mailmap.h"
 #include "git2/sys/commit.h"
 
 #include "odb.h"
@@ -75,7 +74,7 @@ static int git_commit__create_buffer_internal(
 	return 0;
 
 on_error:
-	git_buf_dispose(out);
+	git_buf_free(out);
 	return -1;
 }
 
@@ -177,7 +176,7 @@ static int git_commit__create_internal(
 cleanup:
 	git_array_clear(parents);
 	git_reference_free(ref);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 
@@ -420,7 +419,7 @@ int git_commit__parse(void *_commit, git_odb_object *odb_obj)
 		return -1;
 
 	/* Some tools create multiple author fields, ignore the extra ones */
-	while ((size_t)(buffer_end - buffer) >= strlen("author ") && !git__prefixcmp(buffer, "author ")) {
+	while (!git__prefixncmp(buffer, buffer_end - buffer, "author ")) {
 		if (git_signature__parse(&dummy_sig, &buffer, buffer_end, "author ", '\n') < 0)
 			return -1;
 
@@ -444,7 +443,7 @@ int git_commit__parse(void *_commit, git_odb_object *odb_obj)
 		while (eoln < buffer_end && *eoln != '\n')
 			++eoln;
 
-		if (git__prefixcmp(buffer, "encoding ") == 0) {
+		if (git__prefixncmp(buffer, buffer_end - buffer, "encoding ") == 0) {
 			buffer += strlen("encoding ");
 
 			commit->message_encoding = git__strndup(buffer, eoln - buffer);
@@ -887,18 +886,6 @@ int git_commit_create_with_signature(
 		goto cleanup;
 
 cleanup:
-	git_buf_dispose(&commit);
+	git_buf_free(&commit);
 	return error;
 }
-
-int git_commit_committer_with_mailmap(
-	git_signature **out, const git_commit *commit, const git_mailmap *mailmap)
-{
-	return git_mailmap_resolve_signature(out, mailmap, commit->committer);
-}
-
-int git_commit_author_with_mailmap(
-	git_signature **out, const git_commit *commit, const git_mailmap *mailmap)
-{
-	return git_mailmap_resolve_signature(out, mailmap, commit->author);
-}

data/vendor/libgit2/src/commit_list.c

@@ -69,11 +69,15 @@ static int commit_error(git_commit_list_node *commit, const char *msg)
 static git_commit_list_node **alloc_parents(
 	git_revwalk *walk, git_commit_list_node *commit, size_t n_parents)
 {
+	size_t bytes;
+
 	if (n_parents <= PARENTS_PER_COMMIT)
 		return (git_commit_list_node **)((char *)commit + sizeof(git_commit_list_node));
 
-	return (git_commit_list_node **)git_pool_malloc(
-		&walk->commit_pool, (uint32_t)(n_parents * sizeof(git_commit_list_node *)));
+	if (git__multiply_sizet_overflow(&bytes, n_parents, sizeof(git_commit_list_node *)))
+		return NULL;
+
+	return (git_commit_list_node **)git_pool_malloc(&walk->commit_pool, bytes);
 }
 
 
@@ -171,7 +175,9 @@ static int commit_quick_parse(
 			buffer--;
 	}
 
-	if ((buffer == committer_start) || (git__strtol64(&commit_time, (char *)(buffer + 1), NULL, 10) < 0))
+	if ((buffer == committer_start) ||
+	    (git__strntol64(&commit_time, (char *)(buffer + 1),
+			    buffer_end - buffer + 1, NULL, 10) < 0))
 		return commit_error(commit, "cannot parse commit time");
 
 	commit->time = commit_time;

data/vendor/libgit2/src/common.h

@@ -17,10 +17,8 @@
 /** Declare a function as always inlined. */
 #if defined(_MSC_VER)
 # define GIT_INLINE(type) static __inline type
-#elif defined(__GNUC__)
-# define GIT_INLINE(type) static __inline__ type
 #else
-# define GIT_INLINE(type) static type
+# define GIT_INLINE(type) static inline type
 #endif
 
 /** Support for gcc/clang __has_builtin intrinsic */

data/vendor/libgit2/src/config.c

@@ -109,7 +109,7 @@ int git_config_add_file_ondisk(
 	assert(cfg && path);
 
 	res = p_stat(path, &st);
-	if (res < 0 && errno != ENOENT) {
+	if (res < 0 && errno != ENOENT && errno != ENOTDIR) {
 		giterr_set(GITERR_CONFIG, "failed to stat '%s'", path);
 		return -1;
 	}
@@ -513,6 +513,8 @@ int git_config_backend_foreach_match(
 	regex_t regex;
 	int error = 0;
 
+	assert(backend && cb);
+
 	if (regexp != NULL) {
 		if ((error = p_regcomp(&regex, regexp, REG_EXTENDED)) != 0) {
 			giterr_set_regex(&regex, error);
@@ -1109,8 +1111,15 @@ int git_config_find_system(git_buf *path)
 
 int git_config_find_programdata(git_buf *path)
 {
+	int ret;
+
 	git_buf_sanitize(path);
-	return git_sysdir_find_programdata_file(path, GIT_CONFIG_FILENAME_PROGRAMDATA);
+	ret = git_sysdir_find_programdata_file(path,
+					       GIT_CONFIG_FILENAME_PROGRAMDATA);
+	if (ret != GIT_OK)
+		return ret;
+
+	return git_path_validate_system_file_ownership(path->ptr);
 }
 
 int git_config__global_location(git_buf *buf)
@@ -1164,7 +1173,7 @@ int git_config_open_default(git_config **out)
 		error = git_config_add_file_ondisk(cfg, buf.ptr,
 			GIT_CONFIG_LEVEL_PROGRAMDATA, NULL, 0);
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	if (error) {
 		git_config_free(cfg);
@@ -1300,7 +1309,7 @@ int git_config_parse_int64(int64_t *out, const char *value)
 	const char *num_end;
 	int64_t num;
 
-	if (!value || git__strtol64(&num, value, &num_end, 0) < 0)
+	if (!value || git__strntol64(&num, value, strlen(value), &num_end, 0) < 0)
 		goto fail_parse;
 
 	switch (*num_end) {
@@ -1478,8 +1487,8 @@ int git_config_rename_section(
 		config, git_buf_cstr(&pattern), rename_config_entries_cb, &data);
 
 cleanup:
-	git_buf_dispose(&pattern);
-	git_buf_dispose(&replace);
+	git_buf_free(&pattern);
+	git_buf_free(&replace);
 
 	return error;
 }

data/vendor/libgit2/src/config_file.c

@@ -23,30 +23,69 @@
 #include <sys/types.h>
 #include <regex.h>
 
-typedef struct config_entry_list {
-	struct config_entry_list *next;
+typedef struct cvar_t {
+	struct cvar_t *next;
 	git_config_entry *entry;
-} config_entry_list;
+	bool included; /* whether this is part of [include] */
+} cvar_t;
 
 typedef struct git_config_file_iter {
 	git_config_iterator parent;
-	config_entry_list *head;
+	git_strmap_iter iter;
+	cvar_t* next_var;
 } git_config_file_iter;
 
 /* Max depth for [include] directives */
 #define MAX_INCLUDE_DEPTH 10
 
+#define CVAR_LIST_HEAD(list) ((list)->head)
+
+#define CVAR_LIST_TAIL(list) ((list)->tail)
+
+#define CVAR_LIST_NEXT(var) ((var)->next)
+
+#define CVAR_LIST_EMPTY(list) ((list)->head == NULL)
+
+#define CVAR_LIST_APPEND(list, var) do {\
+	if (CVAR_LIST_EMPTY(list)) {\
+		CVAR_LIST_HEAD(list) = CVAR_LIST_TAIL(list) = var;\
+	} else {\
+		CVAR_LIST_NEXT(CVAR_LIST_TAIL(list)) = var;\
+		CVAR_LIST_TAIL(list) = var;\
+	}\
+} while(0)
+
+#define CVAR_LIST_REMOVE_HEAD(list) do {\
+	CVAR_LIST_HEAD(list) = CVAR_LIST_NEXT(CVAR_LIST_HEAD(list));\
+} while(0)
+
+#define CVAR_LIST_REMOVE_AFTER(var) do {\
+	CVAR_LIST_NEXT(var) = CVAR_LIST_NEXT(CVAR_LIST_NEXT(var));\
+} while(0)
+
+#define CVAR_LIST_FOREACH(list, iter)\
+	for ((iter) = CVAR_LIST_HEAD(list);\
+		 (iter) != NULL;\
+		 (iter) = CVAR_LIST_NEXT(iter))
+
+/*
+ * Inspired by the FreeBSD functions
+ */
+#define CVAR_LIST_FOREACH_SAFE(start, iter, tmp)\
+	for ((iter) = CVAR_LIST_HEAD(vars);\
+		 (iter) && (((tmp) = CVAR_LIST_NEXT(iter) || 1));\
+		 (iter) = (tmp))
+
 typedef struct {
 	git_atomic refcount;
-	git_strmap *map;
-	config_entry_list *list;
-} diskfile_entries;
+	git_strmap *values;
+} refcounted_strmap;
 
 typedef struct {
 	git_config_backend parent;
 	/* mutex to coordinate accessing the values */
 	git_mutex values_mutex;
-	diskfile_entries *entries;
+	refcounted_strmap *values;
 	const git_repository *repo;
 	git_config_level_t level;
 } diskfile_header;
@@ -69,15 +108,7 @@ typedef struct {
 	diskfile_backend *snapshot_from;
 } diskfile_readonly_backend;
 
-typedef struct {
-	const git_repository *repo;
-	const char *file_path;
-	diskfile_entries *entries;
-	git_config_level_t level;
-	unsigned int depth;
-} diskfile_parse_state;
-
-static int config_read(diskfile_entries *entries, const git_repository *repo, git_config_file *file, git_config_level_t level, int depth);
+static int config_read(git_strmap *values, const git_repository *repo, git_config_file *file, git_config_level_t level, int depth);
 static int config_write(diskfile_backend *cfg, const char *orig_key, const char *key, const regex_t *preg, const char *value);
 static char *escape_value(const char *ptr);
 
@@ -90,20 +121,15 @@ static int config_error_readonly(void)
 	return -1;
 }
 
-static void config_entry_list_free(config_entry_list *list)
+static void cvar_free(cvar_t *var)
 {
-	config_entry_list *next;
-
-	while (list != NULL) {
-		next = list->next;
-
-		git__free((char*) list->entry->name);
-		git__free((char *) list->entry->value);
-		git__free(list->entry);
-		git__free(list);
+	if (var == NULL)
+		return;
 
-		list = next;
-	};
+	git__free((char*)var->entry->name);
+	git__free((char *)var->entry->value);
+	git__free(var->entry);
+	git__free(var);
 }
 
 int git_config_file_normalize_section(char *start, char *end)
@@ -129,70 +155,57 @@ int git_config_file_normalize_section(char *start, char *end)
 	return 0;
 }
 
-static void config_entry_list_append(config_entry_list **list, config_entry_list *entry)
-{
-	config_entry_list *head = *list;
-
-	if (head) {
-		while (head->next != NULL)
-			head = head->next;
-		head->next = entry;
-	} else {
-		*list = entry;
-	}
-}
-
 /* Add or append the new config option */
-static int diskfile_entries_append(diskfile_entries *entries, git_config_entry *entry)
+static int append_entry(git_strmap *values, cvar_t *var)
 {
 	git_strmap_iter pos;
-	config_entry_list *existing, *var;
+	cvar_t *existing;
 	int error = 0;
 
-	var = git__calloc(1, sizeof(config_entry_list));
-	GITERR_CHECK_ALLOC(var);
-	var->entry = entry;
-
-	pos = git_strmap_lookup_index(entries->map, entry->name);
-	if (!git_strmap_valid_index(entries->map, pos)) {
-		git_strmap_insert(entries->map, entry->name, var, &error);
-
-		if (error > 0)
-			error = 0;
+	pos = git_strmap_lookup_index(values, var->entry->name);
+	if (!git_strmap_valid_index(values, pos)) {
+		git_strmap_insert(values, var->entry->name, var, &error);
 	} else {
-		existing = git_strmap_value_at(entries->map, pos);
-		config_entry_list_append(&existing, var);
+		existing = git_strmap_value_at(values, pos);
+		while (existing->next != NULL) {
+			existing = existing->next;
+		}
+		existing->next = var;
 	}
 
-	var = git__calloc(1, sizeof(config_entry_list));
-	GITERR_CHECK_ALLOC(var);
-	var->entry = entry;
-	config_entry_list_append(&entries->list, var);
+	if (error > 0)
+		error = 0;
 
 	return error;
 }
 
-static void diskfile_entries_free(diskfile_entries *entries)
+static void free_vars(git_strmap *values)
 {
-	config_entry_list *list = NULL, *next;
+	cvar_t *var = NULL;
 
-	if (!entries)
+	if (values == NULL)
 		return;
 
-	if (git_atomic_dec(&entries->refcount) != 0)
-		return;
+	git_strmap_foreach_value(values, var,
+		while (var != NULL) {
+			cvar_t *next = CVAR_LIST_NEXT(var);
+			cvar_free(var);
+			var = next;
+		});
 
-	git_strmap_foreach_value(entries->map, list, config_entry_list_free(list));
-	git_strmap_free(entries->map);
+	git_strmap_free(values);
+}
 
-	list = entries->list;
-	while (list != NULL) {
-		next = list->next;
-		git__free(list);
-		list = next;
-	}
+static void refcounted_strmap_free(refcounted_strmap *map)
+{
+	if (!map)
+		return;
 
-	git__free(entries);
+	if (git_atomic_dec(&map->refcount) != 0)
+		return;
+
+	free_vars(map->values);
+	git__free(map);
 }
 
 /**
@@ -200,37 +213,37 @@ static void diskfile_entries_free(diskfile_entries *entries)
  * refcount. This is its own function to make sure we use the mutex to
  * avoid the map pointer from changing under us.
  */
-static diskfile_entries *diskfile_entries_take(diskfile_header *h)
+static refcounted_strmap *refcounted_strmap_take(diskfile_header *h)
 {
-	diskfile_entries *entries;
+	refcounted_strmap *map;
 
 	if (git_mutex_lock(&h->values_mutex) < 0) {
 	    giterr_set(GITERR_OS, "failed to lock config backend");
 	    return NULL;
 	}
 
-	entries = h->entries;
-	git_atomic_inc(&entries->refcount);
+	map = h->values;
+	git_atomic_inc(&map->refcount);
 
 	git_mutex_unlock(&h->values_mutex);
 
-	return entries;
+	return map;
 }
 
-static int diskfile_entries_alloc(diskfile_entries **out)
+static int refcounted_strmap_alloc(refcounted_strmap **out)
 {
-	diskfile_entries *entries;
+	refcounted_strmap *map;
 	int error;
 
-	entries = git__calloc(1, sizeof(diskfile_entries));
-	GITERR_CHECK_ALLOC(entries);
+	map = git__calloc(1, sizeof(refcounted_strmap));
+	GITERR_CHECK_ALLOC(map);
 
-	git_atomic_set(&entries->refcount, 1);
+	git_atomic_set(&map->refcount, 1);
 
-	if ((error = git_strmap_alloc(&entries->map)) < 0)
-		git__free(entries);
+	if ((error = git_strmap_alloc(&map->values)) < 0)
+		git__free(map);
 	else
-		*out = entries;
+		*out = map;
 
 	return error;
 }
@@ -259,15 +272,15 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const
 	b->header.level = level;
 	b->header.repo = repo;
 
-	if ((res = diskfile_entries_alloc(&b->header.entries)) < 0)
+	if ((res = refcounted_strmap_alloc(&b->header.values)) < 0)
 		return res;
 
 	if (!git_path_exists(b->file.path))
 		return 0;
 
-	if (res < 0 || (res = config_read(b->header.entries, repo, &b->file, level, 0)) < 0) {
-		diskfile_entries_free(b->header.entries);
-		b->header.entries = NULL;
+	if (res < 0 || (res = config_read(b->header.values->values, repo, &b->file, level, 0)) < 0) {
+		refcounted_strmap_free(b->header.values);
+		b->header.values = NULL;
 	}
 
 	return res;
@@ -300,7 +313,7 @@ static int config_is_modified(int *modified, struct config_file *file)
 	}
 
 out:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return error;
 }
@@ -308,7 +321,7 @@ out:
 static int config_refresh(git_config_backend *cfg)
 {
 	diskfile_backend *b = (diskfile_backend *)cfg;
-	diskfile_entries *entries = NULL, *tmp;
+	refcounted_strmap *values = NULL, *tmp;
 	git_config_file *include;
 	int error, modified;
 	uint32_t i;
@@ -323,7 +336,7 @@ static int config_refresh(git_config_backend *cfg)
 	if (!modified)
 		return 0;
 
-	if ((error = diskfile_entries_alloc(&entries)) < 0)
+	if ((error = refcounted_strmap_alloc(&values)) < 0)
 		goto out;
 
 	/* Reparse the current configuration */
@@ -332,7 +345,7 @@ static int config_refresh(git_config_backend *cfg)
 	}
 	git_array_clear(b->file.includes);
 
-	if ((error = config_read(entries, b->header.repo, &b->file, b->header.level, 0)) < 0)
+	if ((error = config_read(values->values, b->header.repo, &b->file, b->header.level, 0)) < 0)
 		goto out;
 
 	if ((error = git_mutex_lock(&b->header.values_mutex)) < 0) {
@@ -340,14 +353,14 @@ static int config_refresh(git_config_backend *cfg)
 		goto out;
 	}
 
-	tmp = b->header.entries;
-	b->header.entries = entries;
-	entries = tmp;
+	tmp = b->header.values;
+	b->header.values = values;
+	values = tmp;
 
 	git_mutex_unlock(&b->header.values_mutex);
 
 out:
-	diskfile_entries_free(entries);
+	refcounted_strmap_free(values);
 
 	return (error == GIT_ENOTFOUND) ? 0 : error;
 }
@@ -360,7 +373,7 @@ static void backend_free(git_config_backend *_backend)
 		return;
 
 	config_file_clear(&backend->file);
-	diskfile_entries_free(backend->header.entries);
+	refcounted_strmap_free(backend->header.values);
 	git_mutex_free(&backend->header.values_mutex);
 	git__free(backend);
 }
@@ -377,12 +390,24 @@ static int config_iterator_next(
 	git_config_iterator *iter)
 {
 	git_config_file_iter *it = (git_config_file_iter *) iter;
+	diskfile_header *h = (diskfile_header *) it->parent.backend;
+	git_strmap *values = h->values->values;
+	int err = 0;
+	cvar_t * var;
 
-	if (!it->head)
-		return GIT_ITEROVER;
+	if (it->next_var == NULL) {
+		err = git_strmap_next((void**) &var, &(it->iter), values);
+	} else {
+		var = it->next_var;
+	}
 
-	*entry = it->head->entry;
-	it->head = it->head->next;
+	if (err < 0) {
+		it->next_var = NULL;
+		return err;
+	}
+
+	*entry = var->entry;
+	it->next_var = CVAR_LIST_NEXT(var);
 
 	return 0;
 }
@@ -408,11 +433,15 @@ static int config_iterator_new(
 
 	h = (diskfile_header *)snapshot;
 
+	/* strmap_begin() is currently a macro returning 0 */
+	GIT_UNUSED(h);
+
 	it->parent.backend = snapshot;
-	it->head = h->entries->list;
+	it->iter = git_strmap_begin(h->values);
+	it->next_var = NULL;
+
 	it->parent.next = config_iterator_next;
 	it->parent.free = config_iterator_free;
-
 	*iter = (git_config_iterator *) it;
 
 	return 0;
@@ -421,8 +450,8 @@ static int config_iterator_new(
 static int config_set(git_config_backend *cfg, const char *name, const char *value)
 {
 	diskfile_backend *b = (diskfile_backend *)cfg;
-	diskfile_entries *entries;
-	git_strmap *entry_map;
+	refcounted_strmap *map;
+	git_strmap *values;
 	char *key, *esc_value = NULL;
 	khiter_t pos;
 	int rval, ret;
@@ -430,17 +459,17 @@ static int config_set(git_config_backend *cfg, const char *name, const char *val
 	if ((rval = git_config__normalize_name(name, &key)) < 0)
 		return rval;
 
-	if ((entries = diskfile_entries_take(&b->header)) == NULL)
+	if ((map = refcounted_strmap_take(&b->header)) == NULL)
 		return -1;
-	entry_map = entries->map;
+	values = map->values;
 
 	/*
 	 * Try to find it in the existing values and update it if it
 	 * only has one value.
 	 */
-	pos = git_strmap_lookup_index(entry_map, key);
-	if (git_strmap_valid_index(entry_map, pos)) {
-		config_entry_list *existing = git_strmap_value_at(entry_map, pos);
+	pos = git_strmap_lookup_index(values, key);
+	if (git_strmap_valid_index(values, pos)) {
+		cvar_t *existing = git_strmap_value_at(values, pos);
 
 		if (existing->next != NULL) {
 			giterr_set(GITERR_CONFIG, "multivar incompatible with simple set");
@@ -448,7 +477,7 @@ static int config_set(git_config_backend *cfg, const char *name, const char *val
 			goto out;
 		}
 
-		if (existing->entry->include_depth) {
+		if (existing->included) {
 			giterr_set(GITERR_CONFIG, "modifying included variable is not supported");
 			ret = -1;
 			goto out;
@@ -476,17 +505,17 @@ static int config_set(git_config_backend *cfg, const char *name, const char *val
 	ret = config_refresh(cfg);
 
 out:
-	diskfile_entries_free(entries);
+	refcounted_strmap_free(map);
 	git__free(esc_value);
 	git__free(key);
 	return ret;
 }
 
 /* release the map containing the entry as an equivalent to freeing it */
-static void free_diskfile_entry(git_config_entry *entry)
+static void release_map(git_config_entry *entry)
 {
-	diskfile_entries *map = (diskfile_entries *) entry->payload;
-	diskfile_entries_free(map);
+	refcounted_strmap *map = (refcounted_strmap *) entry->payload;
+	refcounted_strmap_free(map);
 }
 
 /*
@@ -495,34 +524,34 @@ static void free_diskfile_entry(git_config_entry *entry)
 static int config_get(git_config_backend *cfg, const char *key, git_config_entry **out)
 {
 	diskfile_header *h = (diskfile_header *)cfg;
-	diskfile_entries *entries;
-	git_strmap *entry_map;
+	refcounted_strmap *map;
+	git_strmap *values;
 	khiter_t pos;
-	config_entry_list *var;
+	cvar_t *var;
 	int error = 0;
 
 	if (!h->parent.readonly && ((error = config_refresh(cfg)) < 0))
 		return error;
 
-	if ((entries = diskfile_entries_take(h)) == NULL)
+	if ((map = refcounted_strmap_take(h)) == NULL)
 		return -1;
-	entry_map = entries->map;
+	values = map->values;
 
-	pos = git_strmap_lookup_index(entry_map, key);
+	pos = git_strmap_lookup_index(values, key);
 
 	/* no error message; the config system will write one */
-	if (!git_strmap_valid_index(entry_map, pos)) {
-		diskfile_entries_free(entries);
+	if (!git_strmap_valid_index(values, pos)) {
+		refcounted_strmap_free(map);
 		return GIT_ENOTFOUND;
 	}
 
-	var = git_strmap_value_at(entry_map, pos);
+	var = git_strmap_value_at(values, pos);
 	while (var->next)
 		var = var->next;
 
 	*out = var->entry;
-	(*out)->free = free_diskfile_entry;
-	(*out)->payload = entries;
+	(*out)->free = release_map;
+	(*out)->payload = map;
 
 	return error;
 }
@@ -562,10 +591,9 @@ out:
 
 static int config_delete(git_config_backend *cfg, const char *name)
 {
-	config_entry_list *var;
+	cvar_t *var;
 	diskfile_backend *b = (diskfile_backend *)cfg;
-	diskfile_entries *map;
-	git_strmap *entry_map;
+	refcounted_strmap *map;	git_strmap *values;
 	char *key;
 	int result;
 	khiter_t pos;
@@ -573,23 +601,23 @@ static int config_delete(git_config_backend *cfg, const char *name)
 	if ((result = git_config__normalize_name(name, &key)) < 0)
 		return result;
 
-	if ((map = diskfile_entries_take(&b->header)) == NULL)
+	if ((map = refcounted_strmap_take(&b->header)) == NULL)
 		return -1;
-	entry_map = b->header.entries->map;
+	values = b->header.values->values;
 
-	pos = git_strmap_lookup_index(entry_map, key);
+	pos = git_strmap_lookup_index(values, key);
 	git__free(key);
 
-	if (!git_strmap_valid_index(entry_map, pos)) {
-		diskfile_entries_free(map);
+	if (!git_strmap_valid_index(values, pos)) {
+		refcounted_strmap_free(map);
 		giterr_set(GITERR_CONFIG, "could not find key '%s' to delete", name);
 		return GIT_ENOTFOUND;
 	}
 
-	var = git_strmap_value_at(entry_map, pos);
-	diskfile_entries_free(map);
+	var = git_strmap_value_at(values, pos);
+	refcounted_strmap_free(map);
 
-	if (var->entry->include_depth) {
+	if (var->included) {
 		giterr_set(GITERR_CONFIG, "cannot delete included variable");
 		return -1;
 	}
@@ -608,8 +636,8 @@ static int config_delete(git_config_backend *cfg, const char *name)
 static int config_delete_multivar(git_config_backend *cfg, const char *name, const char *regexp)
 {
 	diskfile_backend *b = (diskfile_backend *)cfg;
-	diskfile_entries *map;
-	git_strmap *entry_map;
+	refcounted_strmap *map;
+	git_strmap *values;
 	char *key;
 	regex_t preg;
 	int result;
@@ -618,20 +646,20 @@ static int config_delete_multivar(git_config_backend *cfg, const char *name, con
 	if ((result = git_config__normalize_name(name, &key)) < 0)
 		return result;
 
-	if ((map = diskfile_entries_take(&b->header)) == NULL)
+	if ((map = refcounted_strmap_take(&b->header)) == NULL)
 		return -1;
-	entry_map = b->header.entries->map;
+	values = b->header.values->values;
 
-	pos = git_strmap_lookup_index(entry_map, key);
+	pos = git_strmap_lookup_index(values, key);
 
-	if (!git_strmap_valid_index(entry_map, pos)) {
-		diskfile_entries_free(map);
+	if (!git_strmap_valid_index(values, pos)) {
+		refcounted_strmap_free(map);
 		git__free(key);
 		giterr_set(GITERR_CONFIG, "could not find key '%s' to delete", name);
 		return GIT_ENOTFOUND;
 	}
 
-	diskfile_entries_free(map);
+	refcounted_strmap_free(map);
 
 	result = p_regcomp(&preg, regexp, REG_EXTENDED);
 	if (result != 0) {
@@ -688,7 +716,7 @@ static int config_unlock(git_config_backend *_cfg, int success)
 	}
 
 	git_filebuf_cleanup(&cfg->locked_buf);
-	git_buf_dispose(&cfg->locked_content);
+	git_buf_free(&cfg->locked_content);
 	cfg->locked = false;
 
 	return error;
@@ -784,7 +812,7 @@ static void backend_readonly_free(git_config_backend *_backend)
 	if (backend == NULL)
 		return;
 
-	diskfile_entries_free(backend->header.entries);
+	refcounted_strmap_free(backend->header.values);
 	git_mutex_free(&backend->header.values_mutex);
 	git__free(backend);
 }
@@ -794,7 +822,7 @@ static int config_readonly_open(git_config_backend *cfg, git_config_level_t leve
 	diskfile_readonly_backend *b = (diskfile_readonly_backend *) cfg;
 	diskfile_backend *src = b->snapshot_from;
 	diskfile_header *src_header = &src->header;
-	diskfile_entries *entries;
+	refcounted_strmap *src_map;
 	int error;
 
 	if (!src_header->parent.readonly && (error = config_refresh(&src_header->parent)) < 0)
@@ -804,9 +832,9 @@ static int config_readonly_open(git_config_backend *cfg, git_config_level_t leve
 	GIT_UNUSED(level);
 	GIT_UNUSED(repo);
 
-	if ((entries = diskfile_entries_take(src_header)) == NULL)
+	if ((src_map = refcounted_strmap_take(src_header)) == NULL)
 		return -1;
-	b->header.entries = entries;
+	b->header.values = src_map;
 
 	return 0;
 }
@@ -876,20 +904,33 @@ static char *escape_value(const char *ptr)
 		ptr++;
 	}
 
-	if (git_buf_oom(&buf))
+	if (git_buf_oom(&buf)) {
+		git_buf_free(&buf);
 		return NULL;
+	}
 
 	return git_buf_detach(&buf);
 }
 
+struct parse_data {
+	const git_repository *repo;
+	const char *file_path;
+	git_strmap *values;
+	git_config_level_t level;
+	int depth;
+};
+
 static int parse_include(git_config_parser *reader,
-	diskfile_parse_state *parse_data, const char *file)
+	struct parse_data *parse_data, const char *file)
 {
 	struct config_file *include;
 	git_buf path = GIT_BUF_INIT;
 	char *dir;
 	int result;
 
+	if (!file)
+		return 0;
+
 	if ((result = git_path_dirname_r(&path, reader->file->path)) < 0)
 		return result;
 
@@ -905,7 +946,7 @@ static int parse_include(git_config_parser *reader,
 	git_array_init(include->includes);
 	include->path = git_buf_detach(&path);
 
-	result = config_read(parse_data->entries, parse_data->repo,
+	result = config_read(parse_data->values, parse_data->repo,
 		include, parse_data->level, parse_data->depth+1);
 
 	if (result == GIT_ENOTFOUND) {
@@ -954,7 +995,7 @@ static int do_match_gitdir(
 	*matches = (error == 0);
 
 out:
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	return error;
 }
 
@@ -985,13 +1026,13 @@ static const struct {
 };
 
 static int parse_conditional_include(git_config_parser *reader,
-	diskfile_parse_state *parse_data, const char *section, const char *file)
+	struct parse_data *parse_data, const char *section, const char *file)
 {
 	char *condition;
 	size_t i;
 	int error = 0, matches;
 
-	if (!parse_data->repo)
+	if (!parse_data->repo || !file)
 		return 0;
 
 	condition = git__substrdup(section + strlen("includeIf."),
@@ -1020,60 +1061,72 @@ static int parse_conditional_include(git_config_parser *reader,
 static int read_on_variable(
 	git_config_parser *reader,
 	const char *current_section,
-	const char *var_name,
-	const char *var_value,
+	char *var_name,
+	char *var_value,
 	const char *line,
 	size_t line_len,
 	void *data)
 {
-	diskfile_parse_state *parse_data = (diskfile_parse_state *)data;
+	struct parse_data *parse_data = (struct parse_data *)data;
 	git_buf buf = GIT_BUF_INIT;
-	git_config_entry *entry;
-	const char *c;
+	cvar_t *var;
 	int result = 0;
 
 	GIT_UNUSED(line);
 	GIT_UNUSED(line_len);
 
-	git_buf_puts(&buf, current_section);
-	git_buf_putc(&buf, '.');
-	for (c = var_name; *c; c++)
-		git_buf_putc(&buf, git__tolower(*c));
+	if (current_section) {
+		/* TODO: Once warnings lang, we should likely warn
+		 * here. Git appears to warn in most cases if it sees
+		 * un-namespaced config options.
+		 */
+		git_buf_puts(&buf, current_section);
+		git_buf_putc(&buf, '.');
+	}
+	git__strtolower(var_name);
+	git_buf_puts(&buf, var_name);
+	git__free(var_name);
 
-	if (git_buf_oom(&buf))
+	if (git_buf_oom(&buf)) {
+		git__free(var_value);
 		return -1;
+	}
 
-	entry = git__calloc(1, sizeof(git_config_entry));
-	GITERR_CHECK_ALLOC(entry);
-	entry->name = git_buf_detach(&buf);
-	entry->value = var_value ? git__strdup(var_value) : NULL;
-	entry->level = parse_data->level;
-	entry->include_depth = parse_data->depth;
+	var = git__calloc(1, sizeof(cvar_t));
+	GITERR_CHECK_ALLOC(var);
+	var->entry = git__calloc(1, sizeof(git_config_entry));
+	GITERR_CHECK_ALLOC(var->entry);
 
-	if ((result = diskfile_entries_append(parse_data->entries, entry)) < 0)
+	var->entry->name = git_buf_detach(&buf);
+	var->entry->value = var_value;
+	var->entry->level = parse_data->level;
+	var->included = !!parse_data->depth;
+
+	if ((result = append_entry(parse_data->values, var)) < 0)
 		return result;
 
 	result = 0;
 
 	/* Add or append the new config option */
-	if (!git__strcmp(entry->name, "include.path"))
-		result = parse_include(reader, parse_data, entry->value);
-	else if (!git__prefixcmp(entry->name, "includeif.") &&
-	         !git__suffixcmp(entry->name, ".path"))
+	if (!git__strcmp(var->entry->name, "include.path"))
+		result = parse_include(reader, parse_data, var->entry->value);
+	else if (!git__prefixcmp(var->entry->name, "includeif.") &&
+	         !git__suffixcmp(var->entry->name, ".path"))
 		result = parse_conditional_include(reader, parse_data,
-						   entry->name, entry->value);
+						   var->entry->name, var->entry->value);
+
 
 	return result;
 }
 
 static int config_read(
-	diskfile_entries *entries,
+	git_strmap *values,
 	const git_repository *repo,
 	git_config_file *file,
 	git_config_level_t level,
 	int depth)
 {
-	diskfile_parse_state parse_data;
+	struct parse_data parse_data;
 	git_config_parser reader;
 	git_buf contents = GIT_BUF_INIT;
 	int error;
@@ -1101,14 +1154,14 @@ static int config_read(
 
 	parse_data.repo = repo;
 	parse_data.file_path = file->path;
-	parse_data.entries = entries;
+	parse_data.values = values;
 	parse_data.level = level;
 	parse_data.depth = depth;
 
 	error = git_config_parse(&reader, NULL, read_on_variable, NULL, NULL, &parse_data);
 
 out:
-	git_buf_dispose(&contents);
+	git_buf_free(&contents);
 	return error;
 }
 
@@ -1137,7 +1190,7 @@ static int write_section(git_buf *fbuf, const char *key)
 		return -1;
 
 	result = git_buf_put(fbuf, git_buf_cstr(&buf), buf.size);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return result;
 }
@@ -1246,8 +1299,8 @@ static int write_on_section(
 static int write_on_variable(
 	git_config_parser *reader,
 	const char *current_section,
-	const char *var_name,
-	const char *var_value,
+	char *var_name,
+	char *var_value,
 	const char *line,
 	size_t line_len,
 	void *data)
@@ -1276,6 +1329,9 @@ static int write_on_variable(
 	if (has_matched && write_data->preg != NULL)
 		has_matched = (regexec(write_data->preg, var_value, 0, NULL, 0) == 0);
 
+	git__free(var_name);
+	git__free(var_value);
+
 	/* If this isn't the name/value we're looking for, simply dump the
 	 * existing data back out and continue on.
 	 */
@@ -1353,7 +1409,7 @@ static int config_write(diskfile_backend *cfg, const char *orig_key, const char
 		/* Lock the file */
 		if ((result = git_filebuf_open(
 			     &file, cfg->file.path, GIT_FILEBUF_HASH_CONTENTS, GIT_CONFIG_FILE_MODE)) < 0) {
-			git_buf_dispose(&contents);
+			git_buf_free(&contents);
 			return result;
 		}
 
@@ -1398,7 +1454,7 @@ static int config_write(diskfile_backend *cfg, const char *orig_key, const char
 		&write_data);
 	git__free(section);
 	git__free(orig_section);
-	git_buf_dispose(&write_data.buffered_comment);
+	git_buf_free(&write_data.buffered_comment);
 
 	if (result < 0) {
 		git_filebuf_cleanup(&file);
@@ -1408,7 +1464,7 @@ static int config_write(diskfile_backend *cfg, const char *orig_key, const char
 	if (cfg->locked) {
 		size_t len = buf.asize;
 		/* Update our copy with the modified contents */
-		git_buf_dispose(&cfg->locked_content);
+		git_buf_free(&cfg->locked_content);
 		git_buf_attach(&cfg->locked_content, git_buf_detach(&buf), len);
 	} else {
 		git_filebuf_write(&file, git_buf_cstr(&buf), git_buf_len(&buf));
@@ -1416,8 +1472,8 @@ static int config_write(diskfile_backend *cfg, const char *orig_key, const char
 	}
 
 done:
-	git_buf_dispose(&buf);
-	git_buf_dispose(&contents);
+	git_buf_free(&buf);
+	git_buf_free(&contents);
 	git_parse_ctx_clear(&reader.ctx);
 	return result;
 }