rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/repository.h

@@ -37,34 +37,34 @@ extern bool git_repository__fsync_gitdir;
 
 /** Cvar cache identifiers */
 typedef enum {
-	GIT_CONFIGMAP_AUTO_CRLF = 0,    /* core.autocrlf */
-	GIT_CONFIGMAP_EOL,              /* core.eol */
-	GIT_CONFIGMAP_SYMLINKS,         /* core.symlinks */
-	GIT_CONFIGMAP_IGNORECASE,       /* core.ignorecase */
-	GIT_CONFIGMAP_FILEMODE,         /* core.filemode */
-	GIT_CONFIGMAP_IGNORESTAT,       /* core.ignorestat */
-	GIT_CONFIGMAP_TRUSTCTIME,       /* core.trustctime */
-	GIT_CONFIGMAP_ABBREV,           /* core.abbrev */
-	GIT_CONFIGMAP_PRECOMPOSE,       /* core.precomposeunicode */
-	GIT_CONFIGMAP_SAFE_CRLF,		/* core.safecrlf */
-	GIT_CONFIGMAP_LOGALLREFUPDATES, /* core.logallrefupdates */
-	GIT_CONFIGMAP_PROTECTHFS,       /* core.protectHFS */
-	GIT_CONFIGMAP_PROTECTNTFS,      /* core.protectNTFS */
-	GIT_CONFIGMAP_FSYNCOBJECTFILES, /* core.fsyncObjectFiles */
-	GIT_CONFIGMAP_CACHE_MAX
-} git_configmap_item;
+	GIT_CVAR_AUTO_CRLF = 0, /* core.autocrlf */
+	GIT_CVAR_EOL,           /* core.eol */
+	GIT_CVAR_SYMLINKS,      /* core.symlinks */
+	GIT_CVAR_IGNORECASE,    /* core.ignorecase */
+	GIT_CVAR_FILEMODE,      /* core.filemode */
+	GIT_CVAR_IGNORESTAT,    /* core.ignorestat */
+	GIT_CVAR_TRUSTCTIME,    /* core.trustctime */
+	GIT_CVAR_ABBREV,        /* core.abbrev */
+	GIT_CVAR_PRECOMPOSE,    /* core.precomposeunicode */
+	GIT_CVAR_SAFE_CRLF,		/* core.safecrlf */
+	GIT_CVAR_LOGALLREFUPDATES, /* core.logallrefupdates */
+	GIT_CVAR_PROTECTHFS,    /* core.protectHFS */
+	GIT_CVAR_PROTECTNTFS,   /* core.protectNTFS */
+	GIT_CVAR_FSYNCOBJECTFILES, /* core.fsyncObjectFiles */
+	GIT_CVAR_CACHE_MAX
+} git_cvar_cached;
 
 /**
- * Configuration map value enumerations
+ * CVAR value enumerations
  *
- * These are the values that are actually stored in the configmap cache,
- * instead of their string equivalents. These values are internal and
- * symbolic; make sure that none of them is set to `-1`, since that is
- * the unique identifier for "not cached"
+ * These are the values that are actually stored in the cvar cache, instead
+ * of their string equivalents. These values are internal and symbolic;
+ * make sure that none of them is set to `-1`, since that is the unique
+ * identifier for "not cached"
  */
 typedef enum {
 	/* The value hasn't been loaded from the cache yet */
-	GIT_CONFIGMAP_NOT_CACHED = -1,
+	GIT_CVAR_NOT_CACHED = -1,
 
 	/* core.safecrlf: false, 'fail', 'warn' */
 	GIT_SAFE_CRLF_FALSE = 0,
@@ -89,34 +89,34 @@ typedef enum {
 	GIT_EOL_DEFAULT = GIT_EOL_NATIVE,
 
 	/* core.symlinks: bool */
-	GIT_SYMLINKS_DEFAULT = GIT_CONFIGMAP_TRUE,
+	GIT_SYMLINKS_DEFAULT = GIT_CVAR_TRUE,
 	/* core.ignorecase */
-	GIT_IGNORECASE_DEFAULT = GIT_CONFIGMAP_FALSE,
+	GIT_IGNORECASE_DEFAULT = GIT_CVAR_FALSE,
 	/* core.filemode */
-	GIT_FILEMODE_DEFAULT = GIT_CONFIGMAP_TRUE,
+	GIT_FILEMODE_DEFAULT = GIT_CVAR_TRUE,
 	/* core.ignorestat */
-	GIT_IGNORESTAT_DEFAULT = GIT_CONFIGMAP_FALSE,
+	GIT_IGNORESTAT_DEFAULT = GIT_CVAR_FALSE,
 	/* core.trustctime */
-	GIT_TRUSTCTIME_DEFAULT = GIT_CONFIGMAP_TRUE,
+	GIT_TRUSTCTIME_DEFAULT = GIT_CVAR_TRUE,
 	/* core.abbrev */
 	GIT_ABBREV_DEFAULT = 7,
 	/* core.precomposeunicode */
-	GIT_PRECOMPOSE_DEFAULT = GIT_CONFIGMAP_FALSE,
+	GIT_PRECOMPOSE_DEFAULT = GIT_CVAR_FALSE,
 	/* core.safecrlf */
-	GIT_SAFE_CRLF_DEFAULT = GIT_CONFIGMAP_FALSE,
+	GIT_SAFE_CRLF_DEFAULT = GIT_CVAR_FALSE,
 	/* core.logallrefupdates */
-	GIT_LOGALLREFUPDATES_FALSE = GIT_CONFIGMAP_FALSE,
-	GIT_LOGALLREFUPDATES_TRUE = GIT_CONFIGMAP_TRUE,
+	GIT_LOGALLREFUPDATES_FALSE = GIT_CVAR_FALSE,
+	GIT_LOGALLREFUPDATES_TRUE = GIT_CVAR_TRUE,
 	GIT_LOGALLREFUPDATES_UNSET = 2,
 	GIT_LOGALLREFUPDATES_ALWAYS = 3,
 	GIT_LOGALLREFUPDATES_DEFAULT = GIT_LOGALLREFUPDATES_UNSET,
 	/* core.protectHFS */
-	GIT_PROTECTHFS_DEFAULT = GIT_CONFIGMAP_FALSE,
+	GIT_PROTECTHFS_DEFAULT = GIT_CVAR_FALSE,
 	/* core.protectNTFS */
-	GIT_PROTECTNTFS_DEFAULT = GIT_CONFIGMAP_TRUE,
+	GIT_PROTECTNTFS_DEFAULT = GIT_CVAR_TRUE,
 	/* core.fsyncObjectFiles */
-	GIT_FSYNCOBJECTFILES_DEFAULT = GIT_CONFIGMAP_FALSE,
-} git_configmap_value;
+	GIT_FSYNCOBJECTFILES_DEFAULT = GIT_CVAR_FALSE,
+} git_cvar_value;
 
 /* internal repository init flags */
 enum {
@@ -154,7 +154,7 @@ struct git_repository {
 
 	git_atomic attr_session_key;
 
-	git_configmap_value configmap_cache[GIT_CONFIGMAP_CACHE_MAX];
+	git_cvar_value cvar_cache[GIT_CVAR_CACHE_MAX];
 	git_strmap *submodule_cache;
 };
 
@@ -176,13 +176,6 @@ int git_repository_create_head(const char *git_dir, const char *ref_name);
  */
 typedef int (*git_repository_foreach_head_cb)(git_repository *repo, const char *path, void *payload);
 
-enum {
-	/* Skip enumeration of the main repository HEAD */
-	GIT_REPOSITORY_FOREACH_HEAD_SKIP_REPO      = (1u << 0),
-	/* Skip enumeration of worktree HEADs */
-	GIT_REPOSITORY_FOREACH_HEAD_SKIP_WORKTREES = (1u << 1),
-};
-
 /*
  * Iterate over repository and all worktree HEADs.
  *
@@ -191,9 +184,7 @@ enum {
  * executed with the given payload. The return value equals the
  * return value of the last executed callback function.
  */
-int git_repository_foreach_head(git_repository *repo,
-				git_repository_foreach_head_cb cb,
-				int flags, void *payload);
+int git_repository_foreach_head(git_repository *repo, git_repository_foreach_head_cb cb, void *payload);
 
 /*
  * Weak pointers to repository internals.
@@ -208,13 +199,13 @@ int git_repository_refdb__weakptr(git_refdb **out, git_repository *repo);
 int git_repository_index__weakptr(git_index **out, git_repository *repo);
 
 /*
- * Configuration map cache
+ * CVAR cache
  *
  * Efficient access to the most used config variables of a repository.
  * The cache is cleared every time the config backend is replaced.
  */
-int git_repository__configmap_lookup(int *out, git_repository *repo, git_configmap_item item);
-void git_repository__configmap_lookup_cache_clear(git_repository *repo);
+int git_repository__cvar(int *out, git_repository *repo, git_cvar_cached cvar);
+void git_repository__cvar_cache_clear(git_repository *repo);
 
 GIT_INLINE(int) git_repository__ensure_not_bare(
 	git_repository *repo,

data/vendor/libgit2/src/revert.c

@@ -29,7 +29,7 @@ static int write_revert_head(
 	int error = 0;
 
 	if ((error = git_buf_joinpath(&file_path, repo->gitdir, GIT_REVERT_HEAD_FILE)) >= 0 &&
-		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_CREATE_LEADING_DIRS, GIT_REVERT_FILE_MODE)) >= 0 &&
+		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_REVERT_FILE_MODE)) >= 0 &&
 		(error = git_filebuf_printf(&file, "%s\n", commit_oidstr)) >= 0)
 		error = git_filebuf_commit(&file);
 
@@ -51,7 +51,7 @@ static int write_merge_msg(
 	int error = 0;
 
 	if ((error = git_buf_joinpath(&file_path, repo->gitdir, GIT_MERGE_MSG_FILE)) < 0 ||
-		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_CREATE_LEADING_DIRS, GIT_REVERT_FILE_MODE)) < 0 ||
+		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_REVERT_FILE_MODE)) < 0 ||
 		(error = git_filebuf_printf(&file, "Revert \"%s\"\n\nThis reverts commit %s.\n",
 		commit_msgline, commit_oidstr)) < 0)
 		goto cleanup;
@@ -224,14 +224,9 @@ done:
 	return error;
 }
 
-int git_revert_options_init(git_revert_options *opts, unsigned int version)
+int git_revert_init_options(git_revert_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_revert_options, GIT_REVERT_OPTIONS_INIT);
 	return 0;
 }
-
-int git_revert_init_options(git_revert_options *opts, unsigned int version)
-{
-	return git_revert_options_init(opts, version);
-}

data/vendor/libgit2/src/revparse.c

@@ -7,10 +7,11 @@
 
 #include "common.h"
 
+#include <assert.h>
+
 #include "buffer.h"
 #include "tree.h"
 #include "refdb.h"
-#include "regexp.h"
 
 #include "git2.h"
 
@@ -41,7 +42,7 @@ static int maybe_abbrev(git_object** out, git_repository *repo, const char *spec
 	return maybe_sha_or_abbrev(out, repo, spec, speclen);
 }
 
-static int build_regex(git_regexp *regex, const char *pattern)
+static int build_regex(regex_t *regex, const char *pattern)
 {
 	int error;
 
@@ -50,11 +51,13 @@ static int build_regex(git_regexp *regex, const char *pattern)
 		return GIT_EINVALIDSPEC;
 	}
 
-	error = git_regexp_compile(regex, pattern, 0);
+	error = p_regcomp(regex, pattern, REG_EXTENDED);
 	if (!error)
 		return 0;
 
-	git_regexp_dispose(regex);
+	error = git_error_set_regex(regex, error);
+
+	regfree(regex);
 
 	return error;
 }
@@ -63,7 +66,7 @@ static int maybe_describe(git_object**out, git_repository *repo, const char *spe
 {
 	const char *substr;
 	int error;
-	git_regexp regex;
+	regex_t regex;
 
 	substr = strstr(spec, "-g");
 
@@ -73,8 +76,8 @@ static int maybe_describe(git_object**out, git_repository *repo, const char *spe
 	if (build_regex(&regex, ".+-[0-9]+-g[0-9a-fA-F]+") < 0)
 		return -1;
 
-	error = git_regexp_match(&regex, spec);
-	git_regexp_dispose(&regex);
+	error = regexec(&regex, spec, 0, NULL, 0);
+	regfree(&regex);
 
 	if (error)
 		return GIT_ENOTFOUND;
@@ -140,11 +143,12 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out,
 {
 	git_reference *ref = NULL;
 	git_reflog *reflog = NULL;
-	git_regexp preg;
+	regex_t preg;
 	int error = -1;
 	size_t i, numentries, cur;
 	const git_reflog_entry *entry;
 	const char *msg;
+	regmatch_t regexmatches[2];
 	git_buf buf = GIT_BUF_INIT;
 
 	cur = position;
@@ -164,14 +168,12 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out,
 	numentries  = git_reflog_entrycount(reflog);
 
 	for (i = 0; i < numentries; i++) {
-		git_regmatch regexmatches[2];
-
 		entry = git_reflog_entry_byindex(reflog, i);
 		msg = git_reflog_entry_message(entry);
 		if (!msg)
 			continue;
 
-		if (git_regexp_search(&preg, msg, 2, regexmatches) < 0)
+		if (regexec(&preg, msg, 2, regexmatches, 0))
 			continue;
 
 		cur--;
@@ -179,8 +181,7 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out,
 		if (cur > 0)
 			continue;
 
-		if ((git_buf_put(&buf, msg+regexmatches[1].start, regexmatches[1].end - regexmatches[1].start)) < 0)
-			goto cleanup;
+		git_buf_put(&buf, msg+regexmatches[1].rm_so, regexmatches[1].rm_eo - regexmatches[1].rm_so);
 
 		if ((error = git_reference_dwim(base_ref, repo, git_buf_cstr(&buf))) == 0)
 			goto cleanup;
@@ -198,7 +199,7 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out,
 cleanup:
 	git_reference_free(ref);
 	git_buf_dispose(&buf);
-	git_regexp_dispose(&preg);
+	regfree(&preg);
 	git_reflog_free(reflog);
 	return error;
 }
@@ -447,7 +448,7 @@ cleanup:
 	return error;
 }
 
-static int walk_and_search(git_object **out, git_revwalk *walk, git_regexp *regex)
+static int walk_and_search(git_object **out, git_revwalk *walk, regex_t *regex)
 {
 	int error;
 	git_oid oid;
@@ -459,7 +460,7 @@ static int walk_and_search(git_object **out, git_revwalk *walk, git_regexp *rege
 		if ((error < 0) && (error != GIT_ENOTFOUND))
 			return -1;
 
-		if (!git_regexp_match(regex, git_commit_message((git_commit*)obj))) {
+		if (!regexec(regex, git_commit_message((git_commit*)obj), 0, NULL, 0)) {
 			*out = obj;
 			return 0;
 		}
@@ -475,7 +476,7 @@ static int walk_and_search(git_object **out, git_revwalk *walk, git_regexp *rege
 
 static int handle_grep_syntax(git_object **out, git_repository *repo, const git_oid *spec_oid, const char *pattern)
 {
-	git_regexp preg;
+	regex_t preg;
 	git_revwalk *walk = NULL;
 	int error;
 
@@ -496,7 +497,7 @@ static int handle_grep_syntax(git_object **out, git_repository *repo, const git_
 	error = walk_and_search(out, walk, &preg);
 
 cleanup:
-	git_regexp_dispose(&preg);
+	regfree(&preg);
 	git_revwalk_free(walk);
 
 	return error;

data/vendor/libgit2/src/revwalk.c

@@ -21,10 +21,13 @@ git_commit_list_node *git_revwalk__commit_lookup(
 	git_revwalk *walk, const git_oid *oid)
 {
 	git_commit_list_node *commit;
+	size_t pos;
+	int ret;
 
 	/* lookup and reserve space if not already present */
-	if ((commit = git_oidmap_get(walk->commits, oid)) != NULL)
-		return commit;
+	pos = git_oidmap_lookup_index(walk->commits, oid);
+	if (git_oidmap_valid_index(walk->commits, pos))
+		return git_oidmap_value_at(walk->commits, pos);
 
 	commit = git_commit_list_alloc_node(walk);
 	if (commit == NULL)
@@ -32,13 +35,14 @@ git_commit_list_node *git_revwalk__commit_lookup(
 
 	git_oid_cpy(&commit->oid, oid);
 
-	if ((git_oidmap_set(walk->commits, &commit->oid, commit)) < 0)
-		return NULL;
+	pos = git_oidmap_put(walk->commits, &commit->oid, &ret);
+	assert(ret != 0);
+	git_oidmap_set_value_at(walk->commits, pos, commit);
 
 	return commit;
 }
 
-int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_revwalk__push_options *opts)
+static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting, int from_glob)
 {
 	git_oid commit_id;
 	int error;
@@ -54,7 +58,7 @@ int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_re
 
 	if (error == GIT_ENOTFOUND || error == GIT_EINVALIDSPEC || error == GIT_EPEEL) {
 		/* If this comes from e.g. push_glob("tags"), ignore this */
-		if (opts->from_glob)
+		if (from_glob)
 			return 0;
 
 		git_error_set(GIT_ERROR_INVALID, "object is not a committish");
@@ -74,18 +78,16 @@ int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_re
 	if (commit->uninteresting)
 		return 0;
 
-	if (opts->uninteresting) {
+	if (uninteresting) {
 		walk->limited = 1;
 		walk->did_hide = 1;
 	} else {
 		walk->did_push = 1;
 	}
 
-	commit->uninteresting = opts->uninteresting;
+	commit->uninteresting = uninteresting;
 	list = walk->user_input;
-	if ((opts->insert_by_date &&
-	    git_commit_list_insert_by_date(commit, &list) == NULL) ||
-	    git_commit_list_insert(commit, &list) == NULL) {
+	if (git_commit_list_insert(commit, &list) == NULL) {
 		git_error_set_oom();
 		return -1;
 	}
@@ -97,36 +99,29 @@ int git_revwalk__push_commit(git_revwalk *walk, const git_oid *oid, const git_re
 
 int git_revwalk_push(git_revwalk *walk, const git_oid *oid)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
-
 	assert(walk && oid);
-
-	return git_revwalk__push_commit(walk, oid, &opts);
+	return push_commit(walk, oid, 0, false);
 }
 
 
 int git_revwalk_hide(git_revwalk *walk, const git_oid *oid)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && oid);
-
-	opts.uninteresting = 1;
-	return git_revwalk__push_commit(walk, oid, &opts);
+	return push_commit(walk, oid, 1, false);
 }
 
-int git_revwalk__push_ref(git_revwalk *walk, const char *refname, const git_revwalk__push_options *opts)
+static int push_ref(git_revwalk *walk, const char *refname, int hide, int from_glob)
 {
 	git_oid oid;
 
 	if (git_reference_name_to_id(&oid, walk->repo, refname) < 0)
 		return -1;
 
-	return git_revwalk__push_commit(walk, &oid, opts);
+	return push_commit(walk, &oid, hide, from_glob);
 }
 
-int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwalk__push_options *given_opts)
+static int push_glob(git_revwalk *walk, const char *glob, int hide)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	int error = 0;
 	git_buf buf = GIT_BUF_INIT;
 	git_reference *ref;
@@ -135,9 +130,6 @@ int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwal
 
 	assert(walk && glob);
 
-	if (given_opts)
-		memcpy(&opts, given_opts, sizeof(opts));
-
 	/* refs/ is implied if not given in the glob */
 	if (git__prefixcmp(glob, GIT_REFS_DIR) != 0)
 		git_buf_joinpath(&buf, GIT_REFS_DIR, glob);
@@ -153,9 +145,8 @@ int git_revwalk__push_glob(git_revwalk *walk, const char *glob, const git_revwal
 	if ((error = git_reference_iterator_glob_new(&iter, walk->repo, buf.ptr)) < 0)
 		goto out;
 
-	opts.from_glob = true;
 	while ((error = git_reference_next(&ref, iter)) == 0) {
-		error = git_revwalk__push_ref(walk, git_reference_name(ref), &opts);
+		error = push_ref(walk, git_reference_name(ref), hide, true);
 		git_reference_free(ref);
 		if (error < 0)
 			break;
@@ -171,74 +162,52 @@ out:
 
 int git_revwalk_push_glob(git_revwalk *walk, const char *glob)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && glob);
-
-	return git_revwalk__push_glob(walk, glob, &opts);
+	return push_glob(walk, glob, 0);
 }
 
 int git_revwalk_hide_glob(git_revwalk *walk, const char *glob)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && glob);
-
-	opts.uninteresting = 1;
-	return git_revwalk__push_glob(walk, glob, &opts);
+	return push_glob(walk, glob, 1);
 }
 
 int git_revwalk_push_head(git_revwalk *walk)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk);
-
-	return git_revwalk__push_ref(walk, GIT_HEAD_FILE, &opts);
+	return push_ref(walk, GIT_HEAD_FILE, 0, false);
 }
 
 int git_revwalk_hide_head(git_revwalk *walk)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk);
-
-	opts.uninteresting = 1;
-	return git_revwalk__push_ref(walk, GIT_HEAD_FILE, &opts);
+	return push_ref(walk, GIT_HEAD_FILE, 1, false);
 }
 
 int git_revwalk_push_ref(git_revwalk *walk, const char *refname)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && refname);
-
-	return git_revwalk__push_ref(walk, refname, &opts);
+	return push_ref(walk, refname, 0, false);
 }
 
 int git_revwalk_push_range(git_revwalk *walk, const char *range)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	git_revspec revspec;
 	int error = 0;
 
 	if ((error = git_revparse(&revspec, walk->repo, range)))
 		return error;
 
-	if (!revspec.to) {
-		git_error_set(GIT_ERROR_INVALID, "invalid revspec: range not provided");
-		error = GIT_EINVALIDSPEC;
-		goto out;
-	}
-
 	if (revspec.flags & GIT_REVPARSE_MERGE_BASE) {
 		/* TODO: support "<commit>...<commit>" */
 		git_error_set(GIT_ERROR_INVALID, "symmetric differences not implemented in revwalk");
-		error = GIT_EINVALIDSPEC;
-		goto out;
+		return GIT_EINVALIDSPEC;
 	}
 
-	opts.uninteresting = 1;
-	if ((error = git_revwalk__push_commit(walk, git_object_id(revspec.from), &opts)))
+	if ((error = push_commit(walk, git_object_id(revspec.from), 1, false)))
 		goto out;
 
-	opts.uninteresting = 0;
-	error = git_revwalk__push_commit(walk, git_object_id(revspec.to), &opts);
+	error = push_commit(walk, git_object_id(revspec.to), 0, false);
 
 out:
 	git_object_free(revspec.from);
@@ -248,10 +217,8 @@ out:
 
 int git_revwalk_hide_ref(git_revwalk *walk, const char *refname)
 {
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	assert(walk && refname);
-	opts.uninteresting = 1;
-	return git_revwalk__push_ref(walk, refname, &opts);
+	return push_ref(walk, refname, 1, false);
 }
 
 static int revwalk_enqueue_timesort(git_revwalk *walk, git_commit_list_node *commit)
@@ -659,8 +626,8 @@ 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)
-		return -1;
+	walk->commits = git_oidmap_alloc();
+	GIT_ERROR_CHECK_ALLOC(walk->commits);
 
 	if (git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0)
 		return -1;