rugged 1.7.2 → 1.9.4

data/vendor/libgit2/src/libgit2/repository.c

@@ -34,7 +34,6 @@
 #include "submodule.h"
 #include "worktree.h"
 #include "path.h"
-#include "strmap.h"
 
 #ifdef GIT_WIN32
 # include "win32/w32_util.h"
@@ -62,7 +61,8 @@ static const struct {
 	{ GIT_REPOSITORY_ITEM_COMMONDIR, GIT_REPOSITORY_ITEM_GITDIR, "hooks", true },
 	{ GIT_REPOSITORY_ITEM_COMMONDIR, GIT_REPOSITORY_ITEM_GITDIR, "logs", true },
 	{ GIT_REPOSITORY_ITEM_GITDIR, GIT_REPOSITORY_ITEM__LAST, "modules", true },
-	{ GIT_REPOSITORY_ITEM_COMMONDIR, GIT_REPOSITORY_ITEM_GITDIR, "worktrees", true }
+	{ GIT_REPOSITORY_ITEM_COMMONDIR, GIT_REPOSITORY_ITEM_GITDIR, "worktrees", true },
+	{ GIT_REPOSITORY_ITEM_GITDIR, GIT_REPOSITORY_ITEM_GITDIR, "config.worktree", false }
 };
 
 static int check_repositoryformatversion(int *version, git_config *config);
@@ -328,19 +328,34 @@ on_error:
 	return NULL;
 }
 
-int git_repository_new(git_repository **out)
+int git_repository__new(git_repository **out, git_oid_t oid_type)
 {
 	git_repository *repo;
 
 	*out = repo = repository_alloc();
 	GIT_ERROR_CHECK_ALLOC(repo);
 
+	GIT_ASSERT_ARG(git_oid_type_is_valid(oid_type));
+
 	repo->is_bare = 1;
 	repo->is_worktree = 0;
+	repo->oid_type = oid_type;
 
 	return 0;
 }
 
+#ifdef GIT_EXPERIMENTAL_SHA256
+int git_repository_new(git_repository **out, git_repository_new_options *opts)
+{
+	return git_repository__new(out, opts && opts->oid_type ? opts->oid_type : GIT_OID_DEFAULT);
+}
+#else
+int git_repository_new(git_repository** out)
+{
+	return git_repository__new(out, GIT_OID_SHA1);
+}
+#endif
+
 static int load_config_data(git_repository *repo, const git_config *config)
 {
 	int is_bare;
@@ -545,25 +560,39 @@ typedef struct {
 static int validate_ownership_cb(const git_config_entry *entry, void *payload)
 {
 	validate_ownership_data *data = payload;
+	const char *test_path;
 
-	if (strcmp(entry->value, "") == 0) {
+	if (!entry->value || strcmp(entry->value, "") == 0) {
 		*data->is_safe = false;
 	} else if (strcmp(entry->value, "*") == 0) {
 		*data->is_safe = true;
 	} else {
-		const char *test_path = entry->value;
+		if (git_str_sets(&data->tmp, entry->value) < 0)
+			return -1;
+
+		if (!git_fs_path_is_root(data->tmp.ptr)) {
+			/* Input must not have trailing backslash. */
+			if (!data->tmp.size ||
+			    data->tmp.ptr[data->tmp.size - 1] == '/')
+				return 0;
+
+			if (git_fs_path_to_dir(&data->tmp) < 0)
+				return -1;
+		}
+
+		test_path = data->tmp.ptr;
 
-#ifdef GIT_WIN32
 		/*
-		 * Git for Windows does some truly bizarre things with
-		 * paths that start with a forward slash; and expects you
-		 * to escape that with `%(prefix)`. This syntax generally
-		 * means to add the prefix that Git was installed to -- eg
-		 * `/usr/local` -- unless it's an absolute path, in which
-		 * case the leading `%(prefix)/` is just removed. And Git
-		 * for Windows expects you to use this syntax for absolute
-		 * Unix-style paths (in "Git Bash" or Windows Subsystem for
-		 * Linux).
+		 * Git - and especially, Git for Windows - does some
+		 * truly bizarre things with paths that start with a
+		 * forward slash; and expects you to escape that with
+		 * `%(prefix)`. This syntax generally means to add the
+		 * prefix that Git was installed to (eg `/usr/local`)
+		 * unless it's an absolute path, in which case the
+		 * leading `%(prefix)/` is just removed. And Git for
+		 * Windows expects you to use this syntax for absolute
+		 * Unix-style paths (in "Git Bash" or Windows Subsystem
+		 * for Linux).
 		 *
 		 * Worse, the behavior used to be that a leading `/` was
 		 * not absolute. It would indicate that Git for Windows
@@ -578,13 +607,8 @@ static int validate_ownership_cb(const git_config_entry *entry, void *payload)
 		 */
 		if (strncmp(test_path, "%(prefix)//", strlen("%(prefix)//")) == 0)
 			test_path += strlen("%(prefix)/");
-		else if (strncmp(test_path, "//", 2) == 0 &&
-		         strncmp(test_path, "//wsl.localhost/", strlen("//wsl.localhost/")) != 0)
-			test_path++;
-#endif
 
-		if (git_fs_path_prettify_dir(&data->tmp, test_path, NULL) == 0 &&
-		    strcmp(data->tmp.ptr, data->repo_path) == 0)
+		if (strcmp(test_path, data->repo_path) == 0)
 			*data->is_safe = true;
 	}
 
@@ -643,7 +667,7 @@ static int validate_ownership_path(bool *is_safe, const char *path)
 
 static int validate_ownership(git_repository *repo)
 {
-	const char *validation_paths[3] = { NULL }, *path;
+	const char *validation_paths[3] = { NULL }, *path = NULL;
 	size_t validation_len = 0, i;
 	bool is_safe = false;
 	int error = 0;
@@ -681,9 +705,12 @@ static int validate_ownership(git_repository *repo)
 		goto done;
 
 	if (!is_safe) {
+		size_t path_len = git_fs_path_is_root(path) ?
+			strlen(path) : git_fs_path_dirlen(path);
+
 		git_error_set(GIT_ERROR_CONFIG,
-			"repository path '%s' is not owned by current user",
-			path);
+			"repository path '%.*s' is not owned by current user",
+			(int)min(path_len, INT_MAX), path);
 		error = GIT_EOWNER;
 	}
 
@@ -852,8 +879,30 @@ static int load_grafts(git_repository *repo)
 	git_str path = GIT_STR_INIT;
 	int error;
 
-	if ((error = git_repository__item_path(&path, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
-	    (error = git_str_joinpath(&path, path.ptr, "grafts")) < 0 ||
+	/* refresh if they've both been opened previously */
+	if (repo->grafts && repo->shallow_grafts) {
+		if ((error = git_grafts_refresh(repo->grafts)) < 0 ||
+		    (error = git_grafts_refresh(repo->shallow_grafts)) < 0)
+			return error;
+	}
+
+	/* resolve info path, which may not be found for inmemory repository */
+	if ((error = git_repository__item_path(&path, repo, GIT_REPOSITORY_ITEM_INFO)) < 0) {
+		if (error != GIT_ENOTFOUND)
+			return error;
+
+		/* create empty/inmemory grafts for inmemory repository */
+		if (!repo->grafts && (error = git_grafts_new(&repo->grafts, repo->oid_type)) < 0)
+			return error;
+
+		if (!repo->shallow_grafts && (error = git_grafts_new(&repo->shallow_grafts, repo->oid_type)) < 0)
+			return error;
+
+		return 0;
+	}
+
+	/* load grafts from disk */
+	if ((error = git_str_joinpath(&path, path.ptr, "grafts")) < 0 ||
 	    (error = git_grafts_open_or_refresh(&repo->grafts, path.ptr, repo->oid_type)) < 0)
 		goto error;
 
@@ -1174,17 +1223,15 @@ out:
 	return err;
 }
 
-int git_repository__wrap_odb(
-	git_repository **out,
-	git_odb *odb,
-	git_oid_t oid_type)
+int git_repository_wrap_odb(git_repository **out, git_odb *odb)
 {
 	git_repository *repo;
 
 	repo = repository_alloc();
 	GIT_ERROR_CHECK_ALLOC(repo);
 
-	repo->oid_type = oid_type;
+	GIT_ASSERT(git_oid_type_is_valid(odb->options.oid_type));
+	repo->oid_type = odb->options.oid_type;
 
 	git_repository_set_odb(repo, odb);
 	*out = repo;
@@ -1192,21 +1239,6 @@ int git_repository__wrap_odb(
 	return 0;
 }
 
-#ifdef GIT_EXPERIMENTAL_SHA256
-int git_repository_wrap_odb(
-	git_repository **out,
-	git_odb *odb,
-	git_oid_t oid_type)
-{
-	return git_repository__wrap_odb(out, odb, oid_type);
-}
-#else
-int git_repository_wrap_odb(git_repository **out, git_odb *odb)
-{
-	return git_repository__wrap_odb(out, odb, GIT_OID_DEFAULT);
-}
-#endif
-
 int git_repository_discover(
 	git_buf *out,
 	const char *start_path,
@@ -1226,6 +1258,24 @@ int git_repository_discover(
 	return error;
 }
 
+static int has_config_worktree(bool *out, git_config *cfg)
+{
+	int worktreeconfig = 0, error;
+
+	*out = false;
+
+	error = git_config_get_bool(&worktreeconfig, cfg, "extensions.worktreeconfig");
+
+	if (error == 0)
+		*out = worktreeconfig;
+	else if (error == GIT_ENOTFOUND)
+		*out = false;
+	else
+		return error;
+
+	return 0;
+}
+
 static int load_config(
 	git_config **out,
 	git_repository *repo,
@@ -1234,9 +1284,11 @@ static int load_config(
 	const char *system_config_path,
 	const char *programdata_path)
 {
-	int error;
 	git_str config_path = GIT_STR_INIT;
 	git_config *cfg = NULL;
+	git_config_level_t write_order;
+	bool has_worktree;
+	int error;
 
 	GIT_ASSERT_ARG(out);
 
@@ -1250,6 +1302,14 @@ static int load_config(
 		if (error && error != GIT_ENOTFOUND)
 			goto on_error;
 
+		if ((error = has_config_worktree(&has_worktree, cfg)) == 0 &&
+		    has_worktree &&
+		    (error = git_repository__item_path(&config_path, repo, GIT_REPOSITORY_ITEM_WORKTREE_CONFIG)) == 0)
+			error = git_config_add_file_ondisk(cfg, config_path.ptr, GIT_CONFIG_LEVEL_WORKTREE, repo, 0);
+
+		if (error && error != GIT_ENOTFOUND)
+			goto on_error;
+
 		git_str_dispose(&config_path);
 	}
 
@@ -1279,6 +1339,11 @@ static int load_config(
 
 	git_error_clear(); /* clear any lingering ENOTFOUND errors */
 
+	write_order = GIT_CONFIG_LEVEL_LOCAL;
+
+	if ((error = git_config_set_writeorder(cfg, &write_order, 1)) < 0)
+		goto on_error;
+
 	*out = cfg;
 	return 0;
 
@@ -1345,7 +1410,7 @@ int git_repository_config__weakptr(git_config **out, git_repository *repo)
 		git_str xdg_buf = GIT_STR_INIT;
 		git_str programdata_buf = GIT_STR_INIT;
 		bool use_env = repo->use_env;
-		git_config *config;
+		git_config *config = NULL;
 
 		if (!(error = config_path_system(&system_buf, use_env)) &&
 		    !(error = config_path_global(&global_buf, use_env))) {
@@ -1798,7 +1863,10 @@ static int check_repositoryformatversion(int *version, git_config *config)
 
 static const char *builtin_extensions[] = {
 	"noop",
-	"objectformat"
+	"objectformat",
+	"worktreeconfig",
+	"preciousobjects",
+	"relativeworktrees"
 };
 
 static git_vector user_extensions = { 0, git__strcmp_cb };
@@ -2024,7 +2092,7 @@ int git_repository__set_extensions(const char **extensions, size_t len)
 
 void git_repository__free_extensions(void)
 {
-	git_vector_free_deep(&user_extensions);
+	git_vector_dispose_deep(&user_extensions);
 }
 
 int git_repository_create_head(const char *git_dir, const char *ref_name)
@@ -2439,7 +2507,7 @@ static int repo_write_gitlink(
 		error = git_fs_path_make_relative(&path_to_repo, in_dir);
 
 	if (!error)
-		error = git_str_join(&buf, ' ', GIT_FILE_CONTENT_PREFIX, path_to_repo.ptr);
+		error = git_str_printf(&buf, "%s %s\n", GIT_FILE_CONTENT_PREFIX, path_to_repo.ptr);
 
 	if (!error)
 		error = repo_write_template(in_dir, true, DOT_GIT, 0666, true, buf.ptr);
@@ -2471,7 +2539,8 @@ static int repo_init_structure(
 	int error = 0;
 	repo_template_item *tpl;
 	bool external_tpl =
-		((opts->flags & GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE) != 0);
+		 opts->template_path != NULL ||
+		(opts->flags & GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE) != 0;
 	mode_t dmode = pick_dir_mode(opts);
 	bool chmod = opts->mode != GIT_REPOSITORY_INIT_SHARED_UMASK;
 
@@ -2630,6 +2699,8 @@ static int repo_init_directories(
 	if (git_str_joinpath(repo_path, given_repo, add_dotgit ? GIT_DIR : "") < 0)
 		return -1;
 
+	git_fs_path_mkposix(repo_path->ptr);
+
 	has_dotgit = (git__suffixcmp(repo_path->ptr, "/" GIT_DIR) == 0);
 	if (has_dotgit)
 		opts->flags |= GIT_REPOSITORY_INIT__HAS_DOTGIT;
@@ -3197,14 +3268,18 @@ int git_repository_set_workdir(
 	if (git_fs_path_prettify_dir(&path, workdir, NULL) < 0)
 		return -1;
 
-	if (repo->workdir && strcmp(repo->workdir, path.ptr) == 0)
+	if (repo->workdir && strcmp(repo->workdir, path.ptr) == 0) {
+		git_str_dispose(&path);
 		return 0;
+	}
 
 	if (update_gitlink) {
 		git_config *config;
 
-		if (git_repository_config__weakptr(&config, repo) < 0)
+		if (git_repository_config__weakptr(&config, repo) < 0) {
+			git_str_dispose(&path);
 			return -1;
+		}
 
 		error = repo_write_gitlink(path.ptr, git_repository_path(repo), false);
 
@@ -3226,6 +3301,7 @@ int git_repository_set_workdir(
 
 		git__free(old_workdir);
 	}
+	git_str_dispose(&path);
 
 	return error;
 }
@@ -3268,6 +3344,25 @@ int git_repository_set_bare(git_repository *repo)
 	return 0;
 }
 
+int git_repository_head_commit(git_commit **commit, git_repository *repo)
+{
+	git_reference *head;
+	git_object *obj;
+	int error;
+
+	if ((error = git_repository_head(&head, repo)) < 0)
+		return error;
+
+	if ((error = git_reference_peel(&obj, head, GIT_OBJECT_COMMIT)) < 0)
+		goto cleanup;
+
+	*commit = (git_commit *)obj;
+
+cleanup:
+	git_reference_free(head);
+	return error;
+}
+
 int git_repository_head_tree(git_tree **tree, git_repository *repo)
 {
 	git_reference *head;
@@ -3839,3 +3934,89 @@ git_oid_t git_repository_oid_type(git_repository *repo)
 {
 	return repo ? repo->oid_type : 0;
 }
+
+struct mergehead_data {
+	git_repository *repo;
+	git_vector *parents;
+};
+
+static int insert_mergehead(const git_oid *oid, void *payload)
+{
+	git_commit *commit;
+	struct mergehead_data *data = (struct mergehead_data *)payload;
+
+	if (git_commit_lookup(&commit, data->repo, oid) < 0)
+		return -1;
+
+	return git_vector_insert(data->parents, commit);
+}
+
+int git_repository_commit_parents(git_commitarray *out, git_repository *repo)
+{
+	git_commit *first_parent = NULL, *commit;
+	git_reference *head_ref = NULL;
+	git_vector parents = GIT_VECTOR_INIT;
+	struct mergehead_data data;
+	size_t i;
+	int error;
+
+	GIT_ASSERT_ARG(out && repo);
+
+	out->count = 0;
+	out->commits = NULL;
+
+	error = git_revparse_ext((git_object **)&first_parent, &head_ref, repo, "HEAD");
+
+	if (error != 0) {
+		if (error == GIT_ENOTFOUND)
+			error = 0;
+
+		goto done;
+	}
+
+	if ((error = git_vector_insert(&parents, first_parent)) < 0)
+		goto done;
+
+	data.repo = repo;
+	data.parents = &parents;
+
+	error = git_repository_mergehead_foreach(repo, insert_mergehead, &data);
+
+	if (error == GIT_ENOTFOUND)
+		error = 0;
+	else if (error != 0)
+		goto done;
+
+	out->commits = (git_commit **)git_vector_detach(&out->count, NULL, &parents);
+
+done:
+	git_vector_foreach(&parents, i, commit)
+		git__free(commit);
+
+	git_reference_free(head_ref);
+	return error;
+}
+
+int git_repository__abbrev_length(int *out, git_repository *repo)
+{
+	size_t oid_hexsize;
+	int len;
+	int error;
+
+	oid_hexsize = git_oid_hexsize(repo->oid_type);
+
+	if ((error = git_repository__configmap_lookup(&len, repo, GIT_CONFIGMAP_ABBREV)) < 0)
+		return error;
+
+	if (len < GIT_ABBREV_MINIMUM) {
+		git_error_set(GIT_ERROR_CONFIG, "invalid oid abbreviation setting: '%d'", len);
+		return -1;
+	}
+
+	if (len == GIT_ABBREV_FALSE || (size_t)len > oid_hexsize)
+		len = (int)oid_hexsize;
+
+	*out = len;
+
+	return error;
+}

data/vendor/libgit2/src/libgit2/repository.h

@@ -102,6 +102,8 @@ typedef enum {
 	/* core.trustctime */
 	GIT_TRUSTCTIME_DEFAULT = GIT_CONFIGMAP_TRUE,
 	/* core.abbrev */
+	GIT_ABBREV_FALSE = GIT_OID_MAX_HEXSIZE,
+	GIT_ABBREV_MINIMUM = 4,
 	GIT_ABBREV_DEFAULT = 7,
 	/* core.precomposeunicode */
 	GIT_PRECOMPOSE_DEFAULT = GIT_CONFIGMAP_FALSE,
@@ -165,7 +167,7 @@ struct git_repository {
 	git_atomic32 attr_session_key;
 
 	intptr_t configmap_cache[GIT_CONFIGMAP_CACHE_MAX];
-	git_strmap *submodule_cache;
+	git_submodule_cache *submodule_cache;
 };
 
 GIT_INLINE(git_attr_cache *) git_repository_attr_cache(git_repository *repo)
@@ -173,6 +175,7 @@ GIT_INLINE(git_attr_cache *) git_repository_attr_cache(git_repository *repo)
 	return repo->attrcache;
 }
 
+int git_repository_head_commit(git_commit **commit, git_repository *repo);
 int git_repository_head_tree(git_tree **tree, git_repository *repo);
 int git_repository_create_head(const char *git_dir, const char *ref_name);
 
@@ -196,11 +199,6 @@ int git_repository_index__weakptr(git_index **out, git_repository *repo);
 int git_repository_grafts__weakptr(git_grafts **out, git_repository *repo);
 int git_repository_shallow_grafts__weakptr(git_grafts **out, git_repository *repo);
 
-int git_repository__wrap_odb(
-	git_repository **out,
-	git_odb *odb,
-	git_oid_t oid_type);
-
 /*
  * Configuration map cache
  *
@@ -210,6 +208,9 @@ int git_repository__wrap_odb(
 int git_repository__configmap_lookup(int *out, git_repository *repo, git_configmap_item item);
 void git_repository__configmap_lookup_cache_clear(git_repository *repo);
 
+/** Return the length that object names will be abbreviated to. */
+int git_repository__abbrev_length(int *out, git_repository *repo);
+
 int git_repository__item_path(git_str *out, const git_repository *repo, git_repository_item_t item);
 
 GIT_INLINE(int) git_repository__ensure_not_bare(
@@ -280,4 +281,7 @@ int git_repository__set_objectformat(
 	git_repository *repo,
 	git_oid_t oid_type);
 
+/* SHA256-aware internal functions */
+int git_repository__new(git_repository **out, git_oid_t oid_type);
+
 #endif

data/vendor/libgit2/src/libgit2/revert.c

@@ -74,8 +74,7 @@ static int revert_normalize_opts(
 	const char *their_label)
 {
 	int error = 0;
-	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE |
-		GIT_CHECKOUT_ALLOW_CONFLICTS;
+	unsigned int default_checkout_strategy = GIT_CHECKOUT_ALLOW_CONFLICTS;
 
 	GIT_UNUSED(repo);
 

data/vendor/libgit2/src/libgit2/revparse.c

@@ -816,7 +816,7 @@ static int revparse(
 				if (temp_object != NULL)
 					base_rev = temp_object;
 				break;
-			} else if (spec[pos+1] == '\0') {
+			} else if (spec[pos + 1] == '\0' && !pos) {
 				spec = "HEAD";
 				identifier_len = 4;
 				parsed = true;
@@ -935,7 +935,7 @@ int git_revparse(
 		 * allowed.
 		 */
 		if (!git__strcmp(spec, "..")) {
-			git_error_set(GIT_ERROR_INVALID, "Invalid pattern '..'");
+			git_error_set(GIT_ERROR_INVALID, "invalid pattern '..'");
 			return GIT_EINVALIDSPEC;
 		}
 

data/vendor/libgit2/src/libgit2/revwalk.c

@@ -14,6 +14,9 @@
 #include "git2/revparse.h"
 #include "merge.h"
 #include "vector.h"
+#include "hashmap_oid.h"
+
+GIT_HASHMAP_OID_FUNCTIONS(git_revwalk_oidmap, GIT_HASHMAP_INLINE, git_commit_list_node *);
 
 static int get_revision(git_commit_list_node **out, git_revwalk *walk, git_commit_list **list);
 
@@ -23,7 +26,7 @@ git_commit_list_node *git_revwalk__commit_lookup(
 	git_commit_list_node *commit;
 
 	/* lookup and reserve space if not already present */
-	if ((commit = git_oidmap_get(walk->commits, oid)) != NULL)
+	if (git_revwalk_oidmap_get(&commit, &walk->commits, oid) == 0)
 		return commit;
 
 	commit = git_commit_list_alloc_node(walk);
@@ -32,7 +35,7 @@ git_commit_list_node *git_revwalk__commit_lookup(
 
 	git_oid_cpy(&commit->oid, oid);
 
-	if ((git_oidmap_set(walk->commits, &commit->oid, commit)) < 0)
+	if (git_revwalk_oidmap_put(&walk->commits, &commit->oid, commit) < 0)
 		return NULL;
 
 	return commit;
@@ -623,7 +626,7 @@ static int prepare_walk(git_revwalk *walk)
 		return GIT_ITEROVER;
 	}
 
-	/* 
+	/*
 	 * This is a bit convoluted, but necessary to maintain the order of
 	 * the commits. This is especially important in situations where
 	 * git_revwalk__push_glob is called with a git_revwalk__push_options
@@ -643,13 +646,13 @@ static int prepare_walk(git_revwalk *walk)
 				git_error_set_oom();
 				return -1;
 			}
-			
+
 			commit->seen = 1;
 			if (commits_last == NULL)
 				commits = new_list;
 			else
 				commits_last->next = new_list;
-			
+
 			commits_last = new_list;
 		}
 	}
@@ -700,8 +703,7 @@ int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo)
 	git_revwalk *walk = git__calloc(1, sizeof(git_revwalk));
 	GIT_ERROR_CHECK_ALLOC(walk);
 
-	if (git_oidmap_new(&walk->commits) < 0 ||
-	    git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 ||
+	if (git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 ||
 	    git_pool_init(&walk->commit_pool, COMMIT_ALLOC) < 0)
 		return -1;
 
@@ -727,7 +729,7 @@ void git_revwalk_free(git_revwalk *walk)
 	git_revwalk_reset(walk);
 	git_odb_free(walk->odb);
 
-	git_oidmap_free(walk->commits);
+	git_revwalk_oidmap_dispose(&walk->commits);
 	git_pool_clear(&walk->commit_pool);
 	git_pqueue_free(&walk->iterator_time);
 	git__free(walk);
@@ -799,17 +801,18 @@ int git_revwalk_next(git_oid *oid, git_revwalk *walk)
 int git_revwalk_reset(git_revwalk *walk)
 {
 	git_commit_list_node *commit;
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 
 	GIT_ASSERT_ARG(walk);
 
-	git_oidmap_foreach_value(walk->commits, commit, {
+	while (git_revwalk_oidmap_iterate(&iter, NULL, &commit, &walk->commits) == 0) {
 		commit->seen = 0;
 		commit->in_degree = 0;
 		commit->topo_delay = 0;
 		commit->uninteresting = 0;
 		commit->added = 0;
 		commit->flags = 0;
-		});
+	}
 
 	git_pqueue_clear(&walk->iterator_time);
 	git_commit_list_free(&walk->iterator_topo);

data/vendor/libgit2/src/libgit2/revwalk.h

@@ -10,19 +10,19 @@
 #include "common.h"
 
 #include "git2/revwalk.h"
-#include "oidmap.h"
 #include "commit_list.h"
 #include "pqueue.h"
 #include "pool.h"
 #include "vector.h"
+#include "hashmap_oid.h"
 
-#include "oidmap.h"
+GIT_HASHMAP_OID_STRUCT(git_revwalk_oidmap, git_commit_list_node *);
 
 struct git_revwalk {
 	git_repository *repo;
 	git_odb *odb;
 
-	git_oidmap *commits;
+	git_revwalk_oidmap commits;
 	git_pool commit_pool;
 
 	git_commit_list *iterator_topo;