rugged 0.27.7 → 0.27.9

data/vendor/libgit2/src/repository.c

@@ -166,7 +166,7 @@ void git_repository_free(git_repository *repo)
 	repo->diff_drivers = NULL;
 
 	for (i = 0; i < repo->reserved_names.size; i++)
-		git_buf_dispose(git_array_get(repo->reserved_names, i));
+		git_buf_free(git_array_get(repo->reserved_names, i));
 	git_array_clear(repo->reserved_names);
 
 	git__free(repo->gitlink);
@@ -203,7 +203,7 @@ static bool valid_repository_path(git_buf *repository_path, git_buf *common_path
 			git_buf_swap(common_path, &common_link);
 		}
 
-		git_buf_dispose(&common_link);
+		git_buf_free(&common_link);
 	}
 	else {
 		git_buf_set(common_path, repository_path->ptr, repository_path->size);
@@ -333,7 +333,7 @@ static int load_workdir(git_repository *repo, git_config *config, git_buf *paren
 
 	GITERR_CHECK_ALLOC(repo->workdir);
 cleanup:
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	git_config_entry_free(ce);
 	return error;
 }
@@ -425,7 +425,7 @@ static int read_gitfile(git_buf *path_out, const char *file_path)
 			path_out, gitlink, git_buf_cstr(path_out));
 	}
 
-	git_buf_dispose(&file);
+	git_buf_free(&file);
 	return error;
 }
 
@@ -556,9 +556,9 @@ static int find_repo(
 		error = GIT_ENOTFOUND;
 	}
 
-	git_buf_dispose(&path);
-	git_buf_dispose(&repo_link);
-	git_buf_dispose(&common_link);
+	git_buf_free(&path);
+	git_buf_free(&repo_link);
+	git_buf_free(&common_link);
 	return error;
 }
 
@@ -574,8 +574,8 @@ int git_repository_open_bare(
 		return error;
 
 	if (!valid_repository_path(&path, &common_path)) {
-		git_buf_dispose(&path);
-		git_buf_dispose(&common_path);
+		git_buf_free(&path);
+		git_buf_free(&common_path);
 		giterr_set(GITERR_REPOSITORY, "path is not a repository: %s", bare_path);
 		return GIT_ENOTFOUND;
 	}
@@ -754,15 +754,15 @@ error:
 success:
 	git_odb_free(odb);
 	git_index_free(index);
-	git_buf_dispose(&common_dir_buf);
-	git_buf_dispose(&work_tree_buf);
-	git_buf_dispose(&alts_buf);
-	git_buf_dispose(&object_dir_buf);
-	git_buf_dispose(&namespace_buf);
-	git_buf_dispose(&index_file_buf);
-	git_buf_dispose(&across_fs_buf);
-	git_buf_dispose(&ceiling_dirs_buf);
-	git_buf_dispose(&dir_buf);
+	git_buf_free(&common_dir_buf);
+	git_buf_free(&work_tree_buf);
+	git_buf_free(&alts_buf);
+	git_buf_free(&object_dir_buf);
+	git_buf_free(&namespace_buf);
+	git_buf_free(&index_file_buf);
+	git_buf_free(&across_fs_buf);
+	git_buf_free(&ceiling_dirs_buf);
+	git_buf_free(&dir_buf);
 	return error;
 }
 
@@ -785,7 +785,7 @@ static int repo_is_worktree(unsigned *out, const git_repository *repo)
 	 * only used when the repository is a working tree. */
 	*out = !!git_path_exists(gitdir_link.ptr);
 
-	git_buf_dispose(&gitdir_link);
+	git_buf_free(&gitdir_link);
 	return error;
 }
 
@@ -856,8 +856,8 @@ int git_repository_open_ext(
 	}
 
 cleanup:
-	git_buf_dispose(&gitdir);
-	git_buf_dispose(&workdir);
+	git_buf_free(&gitdir);
+	git_buf_free(&workdir);
 	git_config_free(config);
 
 	if (error < 0)
@@ -899,7 +899,7 @@ int git_repository_open_from_worktree(git_repository **repo_out, git_worktree *w
 	*repo_out = repo;
 
 out:
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return err;
 }
@@ -955,7 +955,7 @@ static int load_config(
 	if (error && error != GIT_ENOTFOUND)
 		goto on_error;
 
-	git_buf_dispose(&config_path);
+	git_buf_free(&config_path);
 
 	if (global_config_path != NULL &&
 		(error = git_config_add_file_ondisk(
@@ -987,7 +987,7 @@ static int load_config(
 	return 0;
 
 on_error:
-	git_buf_dispose(&config_path);
+	git_buf_free(&config_path);
 	git_config_free(cfg);
 	*out = NULL;
 	return error;
@@ -1034,10 +1034,10 @@ int git_repository_config__weakptr(git_config **out, git_repository *repo)
 			}
 		}
 
-		git_buf_dispose(&global_buf);
-		git_buf_dispose(&xdg_buf);
-		git_buf_dispose(&system_buf);
-		git_buf_dispose(&programdata_buf);
+		git_buf_free(&global_buf);
+		git_buf_free(&xdg_buf);
+		git_buf_free(&system_buf);
+		git_buf_free(&programdata_buf);
 	}
 
 	*out = repo->_config;
@@ -1099,7 +1099,7 @@ int git_repository_odb__weakptr(git_odb **out, git_repository *repo)
 			git_odb_free(odb);
 		}
 
-		git_buf_dispose(&odb_path);
+		git_buf_free(&odb_path);
 	}
 
 	*out = repo->_odb;
@@ -1187,7 +1187,7 @@ int git_repository_index__weakptr(git_index **out, git_repository *repo)
 			error = git_index_set_caps(repo->_index, GIT_INDEXCAP_FROM_OWNER);
 		}
 
-		git_buf_dispose(&index_path);
+		git_buf_free(&index_path);
 	}
 
 	*out = repo->_index;
@@ -1372,11 +1372,11 @@ int git_repository_create_head(const char *git_dir, const char *ref_name)
 		git_filebuf_commit(&ref) < 0)
 		goto fail;
 
-	git_buf_dispose(&ref_path);
+	git_buf_free(&ref_path);
 	return 0;
 
 fail:
-	git_buf_dispose(&ref_path);
+	git_buf_free(&ref_path);
 	git_filebuf_cleanup(&ref);
 	return -1;
 }
@@ -1405,7 +1405,7 @@ static bool is_filesystem_case_insensitive(const char *gitdir_path)
 	if (!git_buf_joinpath(&path, gitdir_path, "CoNfIg"))
 		is_insensitive = git_path_exists(git_buf_cstr(&path));
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	return is_insensitive;
 }
 
@@ -1426,7 +1426,7 @@ static bool are_symlinks_supported(const char *wd_path)
 		symlinks_supported = (S_ISLNK(st.st_mode) != 0);
 
 	(void)p_unlink(path.ptr);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return symlinks_supported;
 }
@@ -1586,8 +1586,8 @@ static int repo_init_config(
 	}
 
 cleanup:
-	git_buf_dispose(&cfg_path);
-	git_buf_dispose(&worktree_path);
+	git_buf_free(&cfg_path);
+	git_buf_free(&worktree_path);
 	git_config_free(config);
 
 	return error;
@@ -1618,7 +1618,7 @@ int git_repository_reinit_filesystem(git_repository *repo, int recurse)
 			config, path.ptr, repo_dir, git_repository_workdir(repo), true);
 
 	git_config_free(config);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	git_repository__cvar_cache_clear(repo);
 
@@ -1666,7 +1666,7 @@ static int repo_write_template(
 	GIT_UNUSED(hidden);
 #endif
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	if (error)
 		giterr_set(GITERR_OS,
@@ -1720,8 +1720,8 @@ static int repo_write_gitlink(
 		error = repo_write_template(in_dir, true, DOT_GIT, 0666, true, buf.ptr);
 
 cleanup:
-	git_buf_dispose(&buf);
-	git_buf_dispose(&path_to_repo);
+	git_buf_free(&buf);
+	git_buf_free(&path_to_repo);
 	return error;
 }
 
@@ -1805,7 +1805,7 @@ static int repo_init_structure(
 			error = git_futils_cp_r(tdir, repo_dir, cpflags, dmode);
 		}
 
-		git_buf_dispose(&template_buf);
+		git_buf_free(&template_buf);
 		git_config_free(cfg);
 
 		if (error < 0) {
@@ -2065,9 +2065,9 @@ int git_repository_init_ext(
 		error = repo_init_create_origin(*out, opts->origin_url);
 
 cleanup:
-	git_buf_dispose(&common_path);
-	git_buf_dispose(&repo_path);
-	git_buf_dispose(&wd_path);
+	git_buf_free(&common_path);
+	git_buf_free(&repo_path);
+	git_buf_free(&wd_path);
 
 	return error;
 }
@@ -2165,7 +2165,7 @@ out:
 	if (error)
 		git_reference_free(head);
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return error;
 }
@@ -2197,7 +2197,7 @@ int git_repository_foreach_head(git_repository *repo, git_repository_foreach_hea
 	}
 
 out:
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	git_strarray_free(&worktrees);
 	return error;
 }
@@ -2440,7 +2440,7 @@ int git_repository__set_orig_head(git_repository *repo, const git_oid *orig_head
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	return error;
 }
@@ -2464,7 +2464,7 @@ int git_repository_message(git_buf *out, git_repository *repo)
 		error = git_futils_readbuffer(out, git_buf_cstr(&path));
 	}
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return error;
 }
@@ -2478,7 +2478,7 @@ int git_repository_message_remove(git_repository *repo)
 		return -1;
 
 	error = p_unlink(git_buf_cstr(&path));
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return error;
 }
@@ -2548,7 +2548,7 @@ cleanup:
 	if (fd >= 0)
 		p_close(fd);
 	git_filter_list_free(fl);
-	git_buf_dispose(&full_path);
+	git_buf_free(&full_path);
 
 	return error;
 }
@@ -2604,7 +2604,7 @@ static int detach(git_repository *repo, const git_oid *id, const char *new)
 	error = git_reference_create(&new_head, repo, GIT_HEAD_FILE, git_object_id(peeled), true, git_buf_cstr(&log_message));
 
 cleanup:
-	git_buf_dispose(&log_message);
+	git_buf_free(&log_message);
 	git_object_free(object);
 	git_object_free(peeled);
 	git_reference_free(current);
@@ -2654,7 +2654,7 @@ int git_repository_set_head(
 	}
 
 cleanup:
-	git_buf_dispose(&log_message);
+	git_buf_free(&log_message);
 	git_reference_free(current);
 	git_reference_free(ref);
 	git_reference_free(new_head);
@@ -2702,7 +2702,7 @@ int git_repository_detach_head(git_repository* repo)
 			1, git_buf_cstr(&log_message));
 
 cleanup:
-	git_buf_dispose(&log_message);
+	git_buf_free(&log_message);
 	git_object_free(object);
 	git_reference_free(old_head);
 	git_reference_free(new_head);
@@ -2749,7 +2749,7 @@ int git_repository_state(git_repository *repo)
 	} else if (git_path_contains_file(&repo_path, GIT_BISECT_LOG_FILE))
 		state = GIT_REPOSITORY_STATE_BISECT;
 
-	git_buf_dispose(&repo_path);
+	git_buf_free(&repo_path);
 	return state;
 }
 
@@ -2778,7 +2778,7 @@ int git_repository__cleanup_files(
 		git_buf_clear(&buf);
 	}
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 
@@ -2811,7 +2811,7 @@ int git_repository_is_shallow(git_repository *repo)
 		return error;
 
 	error = git_path_lstat(path.ptr, &st);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	if (error == GIT_ENOTFOUND) {
 		giterr_clear();

data/vendor/libgit2/src/reset.c

@@ -176,7 +176,7 @@ cleanup:
 	git_object_free(commit);
 	git_index_free(index);
 	git_tree_free(tree);
-	git_buf_dispose(&log_message);
+	git_buf_free(&log_message);
 
 	return error;
 }

data/vendor/libgit2/src/revert.c

@@ -36,7 +36,7 @@ static int write_revert_head(
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	return error;
 }
@@ -62,7 +62,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	return error;
 }
@@ -219,7 +219,7 @@ done:
 	git_index_free(index);
 	git_commit_free(our_commit);
 	git_reference_free(our_ref);
-	git_buf_dispose(&their_label);
+	git_buf_free(&their_label);
 
 	return error;
 }

data/vendor/libgit2/src/revparse.c

@@ -128,7 +128,8 @@ static int try_parse_numeric(int *n, const char *curly_braces_content)
 	int32_t content;
 	const char *end_ptr;
 
-	if (git__strtol32(&content, curly_braces_content, &end_ptr, 10) < 0)
+	if (git__strntol32(&content, curly_braces_content, strlen(curly_braces_content),
+			   &end_ptr, 10) < 0)
 		return -1;
 
 	if (*end_ptr != '\0')
@@ -197,7 +198,7 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out,
 
 cleanup:
 	git_reference_free(ref);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	regfree(&preg);
 	git_reflog_free(reflog);
 	return error;
@@ -350,7 +351,7 @@ static int handle_at_syntax(git_object **out, git_reference **ref, const char *s
 	error = retrieve_revobject_from_reflog(out, ref, repo, git_buf_cstr(&identifier), (size_t)timestamp);
 
 cleanup:
-	git_buf_dispose(&identifier);
+	git_buf_free(&identifier);
 	return error;
 }
 
@@ -578,7 +579,7 @@ static int extract_how_many(int *n, const char *spec, size_t *pos)
 		} while (spec[(*pos)] == kind && kind == '~');
 
 		if (git__isdigit(spec[*pos])) {
-			if (git__strtol32(&parsed, spec + *pos, &end_ptr, 10) < 0)
+			if (git__strntol32(&parsed, spec + *pos, strlen(spec + *pos), &end_ptr, 10) < 0)
 				return GIT_EINVALIDSPEC;
 
 			accumulated += (parsed - 1);
@@ -624,7 +625,7 @@ static int ensure_base_rev_loaded(git_object **object, git_reference **reference
 		return -1;
 
 	error = revparse_lookup_object(object, reference, repo, git_buf_cstr(&identifier));
-	git_buf_dispose(&identifier);
+	git_buf_free(&identifier);
 
 	return error;
 }
@@ -820,7 +821,7 @@ cleanup:
 		git_reference_free(reference);
 	}
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 

data/vendor/libgit2/src/revwalk.c

@@ -15,8 +15,6 @@
 #include "merge.h"
 #include "vector.h"
 
-static int get_revision(git_commit_list_node **out, git_revwalk *walk, git_commit_list **list);
-
 git_commit_list_node *git_revwalk__commit_lookup(
 	git_revwalk *walk, const git_oid *oid)
 {
@@ -78,12 +76,10 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting,
 	if (commit->uninteresting)
 		return 0;
 
-	if (uninteresting) {
-		walk->limited = 1;
+	if (uninteresting)
 		walk->did_hide = 1;
-	} else {
+	else
 		walk->did_push = 1;
-	}
 
 	commit->uninteresting = uninteresting;
 	list = walk->user_input;
@@ -156,7 +152,7 @@ static int push_glob(git_revwalk *walk, const char *glob, int hide)
 	if (error == GIT_ITEROVER)
 		error = 0;
 out:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 
@@ -249,10 +245,9 @@ static int revwalk_next_timesort(git_commit_list_node **object_out, git_revwalk
 
 static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk *walk)
 {
-	int error;
 	git_commit_list_node *next;
 
-	while (!(error = get_revision(&next, walk, &walk->iterator_rand))) {
+	while ((next = git_commit_list_pop(&walk->iterator_rand)) != NULL) {
 		/* Some commits might become uninteresting after being added to the list */
 		if (!next->uninteresting) {
 			*object_out = next;
@@ -260,15 +255,15 @@ static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk
 		}
 	}
 
-	return error;
+	giterr_clear();
+	return GIT_ITEROVER;
 }
 
 static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk *walk)
 {
-	int error;
 	git_commit_list_node *next;
 
-	while (!(error = get_revision(&next, walk, &walk->iterator_topo))) {
+	while ((next = git_commit_list_pop(&walk->iterator_topo)) != NULL) {
 		/* Some commits might become uninteresting after being added to the list */
 		if (!next->uninteresting) {
 			*object_out = next;
@@ -276,7 +271,8 @@ static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk
 		}
 	}
 
-	return error;
+	giterr_clear();
+	return GIT_ITEROVER;
 }
 
 static int revwalk_next_reverse(git_commit_list_node **object_out, git_revwalk *walk)
@@ -388,10 +384,16 @@ static int still_interesting(git_commit_list *list, int64_t time, int slop)
 	if (!list)
 		return 0;
 
+	/*
+	 * If the destination list has commits with an earlier date than our
+	 * source, we want to reset the slop counter as we're not done.
+	 */
+	if (time <= list->item->time)
+		return SLOP;
+
 	for (; list; list = list->next) {
 		/*
-		 * If the destination list has commits with an earlier date than
-		 * our source or if it still contains interesting commits we
+		 * If the destination list still contains interesting commits we
 		 * want to continue looking.
 		 */
 		if (!list->item->uninteresting || list->item->time > time)
@@ -405,7 +407,7 @@ static int still_interesting(git_commit_list *list, int64_t time, int slop)
 static int limit_list(git_commit_list **out, git_revwalk *walk, git_commit_list *commits)
 {
 	int error, slop = SLOP;
-	int64_t time = ~0ll;
+	int64_t time = INT64_MAX;
 	git_commit_list *list = commits;
 	git_commit_list *newlist = NULL;
 	git_commit_list **p = &newlist;
@@ -438,30 +440,6 @@ static int limit_list(git_commit_list **out, git_revwalk *walk, git_commit_list
 	return 0;
 }
 
-static int get_revision(git_commit_list_node **out, git_revwalk *walk, git_commit_list **list)
-{
-	int error;
-	git_commit_list_node *commit;
-
-	commit = git_commit_list_pop(list);
-	if (!commit) {
-		giterr_clear();
-		return GIT_ITEROVER;
-	}
-
-	/*
-	 * If we did not run limit_list and we must add parents to the
-	 * list ourselves.
-	 */
-	if (!walk->limited) {
-		if ((error = add_parents_to_list(walk, commit, list)) < 0)
-			return error;
-	}
-
-	*out = commit;
-	return 0;
-}
-
 static int sort_in_topological_order(git_commit_list **out, git_revwalk *walk, git_commit_list *list)
 {
 	git_commit_list *ll = NULL, *newlist, **pptr;
@@ -550,7 +528,7 @@ cleanup:
 
 static int prepare_walk(git_revwalk *walk)
 {
-	int error;
+	int error = 0;
 	git_commit_list *list, *commits = NULL;
 	git_commit_list_node *next;
 
@@ -574,7 +552,7 @@ static int prepare_walk(git_revwalk *walk)
 		}
 	}
 
-	if (walk->limited && (error = limit_list(&commits, walk, commits)) < 0)
+	if ((error = limit_list(&commits, walk, commits)) < 0)
 		return error;
 
 	if (walk->sorting & GIT_SORT_TOPOLOGICAL) {
@@ -677,9 +655,6 @@ void git_revwalk_sorting(git_revwalk *walk, unsigned int sort_mode)
 		walk->get_next = &revwalk_next_unsorted;
 		walk->enqueue = &revwalk_enqueue_unsorted;
 	}
-
-	if (walk->sorting != GIT_SORT_NONE)
-		walk->limited = 1;
 }
 
 void git_revwalk_simplify_first_parent(git_revwalk *walk)
@@ -735,9 +710,7 @@ void git_revwalk_reset(git_revwalk *walk)
 	git_commit_list_free(&walk->user_input);
 	walk->first_parent = 0;
 	walk->walking = 0;
-	walk->limited = 0;
 	walk->did_push = walk->did_hide = 0;
-	walk->sorting = GIT_SORT_NONE;
 }
 
 int git_revwalk_add_hide_cb(
@@ -758,7 +731,6 @@ int git_revwalk_add_hide_cb(
 
 	walk->hide_cb = hide_cb;
 	walk->hide_cb_payload = payload;
-	walk->limited = 1;
 
 	return 0;
 }