rugged 0.27.7 → 0.27.9

data/vendor/libgit2/src/blame.h

@@ -67,7 +67,6 @@ typedef struct git_blame__entry {
 struct git_blame {
 	char *path;
 	git_repository *repository;
-	git_mailmap *mailmap;
 	git_blame_options options;
 
 	git_vector hunks;

data/vendor/libgit2/src/blame_git.c

@@ -623,8 +623,6 @@ static void coalesce(git_blame *blame)
 
 int git_blame__like_git(git_blame *blame, uint32_t opt)
 {
-	int error = 0;
-
 	while (true) {
 		git_blame__entry *ent;
 		git_blame__origin *suspect = NULL;
@@ -634,13 +632,13 @@ int git_blame__like_git(git_blame *blame, uint32_t opt)
 			if (!ent->guilty)
 				suspect = ent->suspect;
 		if (!suspect)
-			break;
+			return 0; /* all done */
 
 		/* We'll use this suspect later in the loop, so hold on to it for now. */
 		origin_incref(suspect);
 
-		if ((error = pass_blame(blame, suspect, opt)) < 0)
-			break;
+		if (pass_blame(blame, suspect, opt) < 0)
+			return -1;
 
 		/* Take responsibility for the remaining entries */
 		for (ent = blame->ent; ent; ent = ent->next) {
@@ -654,10 +652,9 @@ int git_blame__like_git(git_blame *blame, uint32_t opt)
 		origin_decref(suspect);
 	}
 
-	if (!error)
-		coalesce(blame);
+	coalesce(blame);
 
-	return error;
+	return 0;
 }
 
 void git_blame__free_entry(git_blame__entry *ent)

data/vendor/libgit2/src/blob.c

@@ -126,7 +126,7 @@ static int write_file_filtered(
 		error = git_odb_write(id, odb, tgt.ptr, tgt.size, GIT_OBJ_BLOB);
 	}
 
-	git_buf_dispose(&tgt);
+	git_buf_free(&tgt);
 	return error;
 }
 
@@ -238,7 +238,7 @@ int git_blob__create_from_paths(
 
 done:
 	git_odb_free(odb);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return error;
 }
@@ -257,7 +257,7 @@ int git_blob_create_fromdisk(
 	const char *workdir, *hintpath;
 
 	if ((error = git_path_prettify(&full_path, path, NULL)) < 0) {
-		git_buf_dispose(&full_path);
+		git_buf_free(&full_path);
 		return error;
 	}
 
@@ -270,7 +270,7 @@ int git_blob_create_fromdisk(
 	error = git_blob__create_from_paths(
 		id, NULL, repo, git_buf_cstr(&full_path), hintpath, 0, true);
 
-	git_buf_dispose(&full_path);
+	git_buf_free(&full_path);
 	return error;
 }
 
@@ -340,7 +340,7 @@ cleanup:
 	if (error < 0)
 		blob_writestream_free((git_writestream *) stream);
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	return error;
 }
 

data/vendor/libgit2/src/branch.c

@@ -40,7 +40,7 @@ static int retrieve_branch_reference(
 
 	*branch_reference_out = branch; /* will be NULL on error */
 
-	git_buf_dispose(&ref_name);
+	git_buf_free(&ref_name);
 	return error;
 }
 
@@ -108,8 +108,8 @@ static int create_branch(
 		*ref_out = branch;
 
 cleanup:
-	git_buf_dispose(&canonical_branch_name);
-	git_buf_dispose(&log_message);
+	git_buf_free(&canonical_branch_name);
+	git_buf_free(&log_message);
 	return error;
 }
 
@@ -199,7 +199,7 @@ int git_branch_delete(git_reference *branch)
 	error = git_reference_delete(branch);
 
 on_error:
-	git_buf_dispose(&config_section);
+	git_buf_free(&config_section);
 	return error;
 }
 
@@ -310,10 +310,10 @@ int git_branch_move(
 		git_buf_cstr(&new_config_section));
 
 done:
-	git_buf_dispose(&new_reference_name);
-	git_buf_dispose(&old_config_section);
-	git_buf_dispose(&new_config_section);
-	git_buf_dispose(&log_message);
+	git_buf_free(&new_reference_name);
+	git_buf_free(&old_config_section);
+	git_buf_free(&new_config_section);
+	git_buf_free(&log_message);
 
 	return error;
 }
@@ -366,7 +366,7 @@ static int retrieve_upstream_configuration(
 			return -1;
 
 	error = git_config_get_string_buf(out, config, git_buf_cstr(&buf));
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 
@@ -429,9 +429,9 @@ int git_branch_upstream_name(
 cleanup:
 	git_config_free(config);
 	git_remote_free(remote);
-	git_buf_dispose(&remote_name);
-	git_buf_dispose(&merge_name);
-	git_buf_dispose(&buf);
+	git_buf_free(&remote_name);
+	git_buf_free(&merge_name);
+	git_buf_free(&buf);
 	return error;
 }
 
@@ -522,7 +522,7 @@ int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refna
 
 cleanup:
 	if (error < 0)
-		git_buf_dispose(buf);
+		git_buf_free(buf);
 
 	git_strarray_free(&remote_list);
 	return error;
@@ -544,7 +544,7 @@ int git_branch_upstream(
 		git_reference_owner(branch),
 		git_buf_cstr(&tracking_name));
 
-	git_buf_dispose(&tracking_name);
+	git_buf_free(&tracking_name);
 	return error;
 }
 
@@ -565,11 +565,11 @@ static int unset_upstream(git_config *config, const char *shortname)
 	if (git_config_delete_entry(config, git_buf_cstr(&buf)) < 0)
 		goto on_error;
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return 0;
 
 on_error:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return -1;
 }
 
@@ -655,15 +655,15 @@ int git_branch_set_upstream(git_reference *branch, const char *upstream_name)
 		goto on_error;
 
 	git_reference_free(upstream);
-	git_buf_dispose(&key);
-	git_buf_dispose(&value);
+	git_buf_free(&key);
+	git_buf_free(&value);
 
 	return 0;
 
 on_error:
 	git_reference_free(upstream);
-	git_buf_dispose(&key);
-	git_buf_dispose(&value);
+	git_buf_free(&key);
+	git_buf_free(&value);
 	git_remote_free(remote);
 
 	return -1;

data/vendor/libgit2/src/buffer.c

@@ -116,7 +116,7 @@ int git_buf_grow_by(git_buf *buffer, size_t additional_size)
 	return git_buf_try_grow(buffer, newsize, true);
 }
 
-void git_buf_dispose(git_buf *buf)
+void git_buf_free(git_buf *buf)
 {
 	if (!buf) return;
 
@@ -126,11 +126,6 @@ void git_buf_dispose(git_buf *buf)
 	git_buf_init(buf, 0);
 }
 
-void git_buf_free(git_buf *buf)
-{
-	git_buf_dispose(buf);
-}
-
 void git_buf_sanitize(git_buf *buf)
 {
 	if (buf->ptr == NULL) {
@@ -615,7 +610,7 @@ char *git_buf_detach(git_buf *buf)
 
 int git_buf_attach(git_buf *buf, char *ptr, size_t asize)
 {
-	git_buf_dispose(buf);
+	git_buf_free(buf);
 
 	if (ptr) {
 		buf->ptr = ptr;
@@ -633,7 +628,7 @@ int git_buf_attach(git_buf *buf, char *ptr, size_t asize)
 void git_buf_attach_notowned(git_buf *buf, const char *ptr, size_t size)
 {
 	if (git_buf_is_allocated(buf))
-		git_buf_dispose(buf);
+		git_buf_free(buf);
 
 	if (!size) {
 		git_buf_init(buf, 0);
@@ -954,7 +949,7 @@ int git_buf_quote(git_buf *buf)
 	git_buf_swap(&quoted, buf);
 
 done:
-	git_buf_dispose(&quoted);
+	git_buf_free(&quoted);
 	return error;
 }
 

data/vendor/libgit2/src/buffer.h

@@ -76,7 +76,7 @@ extern char *git_buf_detach(git_buf *buf);
 extern int git_buf_attach(git_buf *buf, char *ptr, size_t asize);
 
 /* Populates a `git_buf` where the contents are not "owned" by the
- * buffer, and calls to `git_buf_dispose` will not free the given buf.
+ * buffer, and calls to `git_buf_free` will not free the given buf.
  */
 extern void git_buf_attach_notowned(
 	git_buf *buf, const char *ptr, size_t size);

data/vendor/libgit2/src/checkout.c

@@ -1604,7 +1604,7 @@ static int blob_content_to_link(
 		st->st_mode = GIT_FILEMODE_LINK;
 	}
 
-	git_buf_dispose(&linktarget);
+	git_buf_free(&linktarget);
 
 	return error;
 }
@@ -2161,13 +2161,13 @@ static int checkout_write_merge(
 done:
 	git_filter_list_free(fl);
 
-	git_buf_dispose(&out_data);
-	git_buf_dispose(&our_label);
-	git_buf_dispose(&their_label);
+	git_buf_free(&out_data);
+	git_buf_free(&our_label);
+	git_buf_free(&their_label);
 
 	git_merge_file_result_free(&result);
-	git_buf_dispose(&path_workdir);
-	git_buf_dispose(&path_suffixed);
+	git_buf_free(&path_workdir);
+	git_buf_free(&path_suffixed);
 
 	return error;
 }
@@ -2347,8 +2347,8 @@ static void checkout_data_clear(checkout_data *data)
 	git__free(data->pfx);
 	data->pfx = NULL;
 
-	git_buf_dispose(&data->target_path);
-	git_buf_dispose(&data->tmp);
+	git_buf_free(&data->target_path);
+	git_buf_free(&data->tmp);
 
 	git_index_free(data->index);
 	data->index = NULL;
@@ -2397,9 +2397,6 @@ static int checkout_data_init(
 				GIT_DIR_MODE, GIT_MKDIR_VERIFY_DIR)) < 0)
 		goto cleanup;
 
-	if ((error = git_repository_index(&data->index, data->repo)) < 0)
-		goto cleanup;
-
 	/* refresh config and index content unless NO_REFRESH is given */
 	if ((data->opts.checkout_strategy & GIT_CHECKOUT_NO_REFRESH) == 0) {
 		git_config *cfg;
@@ -2407,30 +2404,24 @@ static int checkout_data_init(
 		if ((error = git_repository_config__weakptr(&cfg, repo)) < 0)
 			goto cleanup;
 
-		/* Reload the repository index (unless we're checking out the
-		 * index; then it has the changes we're trying to check out
-		 * and those should not be overwritten.)
+		/* Get the repository index and reload it (unless we're checking
+		 * out the index; then it has the changes we're trying to check
+		 * out and those should not be overwritten.)
 		 */
-		if (data->index != git_iterator_index(target)) {
-			if (data->opts.checkout_strategy & GIT_CHECKOUT_FORCE) {
-				/* When forcing, we can blindly re-read the index */
-				if ((error = git_index_read(data->index, false)) < 0)
-					goto cleanup;
-			} else {
-				/*
-				 * When not being forced, we need to check for unresolved
-				 * conflicts and unsaved changes in the index before
-				 * proceeding.
-				 */
-				if (git_index_has_conflicts(data->index)) {
-					error = GIT_ECONFLICT;
-					giterr_set(GITERR_CHECKOUT,
-						"unresolved conflicts exist in the index");
-					goto cleanup;
-				}
+		if ((error = git_repository_index(&data->index, data->repo)) < 0)
+			goto cleanup;
 
-				if ((error = git_index_read_safely(data->index)) < 0)
-					goto cleanup;
+		if (data->index != git_iterator_index(target)) {
+			if ((error = git_index_read(data->index, true)) < 0)
+				goto cleanup;
+
+			/* cannot checkout if unresolved conflicts exist */
+			if ((data->opts.checkout_strategy & GIT_CHECKOUT_FORCE) == 0 &&
+				git_index_has_conflicts(data->index)) {
+				error = GIT_ECONFLICT;
+				giterr_set(GITERR_CHECKOUT,
+					"unresolved conflicts exist in the index");
+				goto cleanup;
 			}
 
 			/* clean conflict data in the current index */

data/vendor/libgit2/src/cherrypick.c

@@ -37,7 +37,7 @@ static int write_cherrypick_head(
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	return error;
 }
@@ -61,7 +61,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	return error;
 }
@@ -216,7 +216,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/clone.c

@@ -48,7 +48,7 @@ static int create_branch(
 		return error;
 
 	error = git_reference_create(&branch_ref, repo, git_buf_cstr(&refname), target, 0, log_message);
-	git_buf_dispose(&refname);
+	git_buf_free(&refname);
 	git_commit_free(head_obj);
 
 	if (!error)
@@ -87,8 +87,8 @@ static int setup_tracking_config(
 	error = 0;
 
 cleanup:
-	git_buf_dispose(&remote_key);
-	git_buf_dispose(&merge_key);
+	git_buf_free(&remote_key);
+	git_buf_free(&merge_key);
 	return error;
 }
 
@@ -195,8 +195,8 @@ static int update_head_to_remote(
 		reflog_message);
 
 cleanup:
-	git_buf_dispose(&remote_master_name);
-	git_buf_dispose(&branch);
+	git_buf_free(&remote_master_name);
+	git_buf_free(&branch);
 
 	return error;
 }
@@ -225,7 +225,7 @@ static int update_head_to_branch(
 
 cleanup:
 	git_reference_free(remote_ref);
-	git_buf_dispose(&remote_branch_name);
+	git_buf_free(&remote_branch_name);
 	return retcode;
 }
 
@@ -351,7 +351,7 @@ static int clone_into(git_repository *repo, git_remote *_remote, const git_fetch
 
 cleanup:
 	git_remote_free(remote);
-	git_buf_dispose(&reflog_message);
+	git_buf_free(&reflog_message);
 
 	return error;
 }
@@ -378,7 +378,7 @@ int git_clone__should_clone_local(const char *url_or_path, git_clone_local_t loc
 		git_path_isdir(path);
 
 done:
-	git_buf_dispose(&fromurl);
+	git_buf_free(&fromurl);
 	return is_local;
 }
 
@@ -510,7 +510,7 @@ static int clone_local_into(git_repository *repo, git_remote *remote, const git_
 
 	/* Copy .git/objects/ from the source to the target */
 	if ((error = git_repository_open(&src, git_buf_cstr(&src_path))) < 0) {
-		git_buf_dispose(&src_path);
+		git_buf_free(&src_path);
 		return error;
 	}
 
@@ -549,10 +549,10 @@ static int clone_local_into(git_repository *repo, git_remote *remote, const git_
 	error = checkout_branch(repo, remote, co_opts, branch, git_buf_cstr(&reflog_message));
 
 cleanup:
-	git_buf_dispose(&reflog_message);
-	git_buf_dispose(&src_path);
-	git_buf_dispose(&src_odb);
-	git_buf_dispose(&dst_odb);
+	git_buf_free(&reflog_message);
+	git_buf_free(&src_path);
+	git_buf_free(&src_odb);
+	git_buf_free(&dst_odb);
 	git_repository_free(src);
 	return error;
 }