rugged 1.1.1 → 1.4.3

data/vendor/libgit2/src/stash.c

@@ -9,7 +9,6 @@
 
 #include "repository.h"
 #include "commit.h"
-#include "message.h"
 #include "tree.h"
 #include "reflog.h"
 #include "blob.h"
@@ -43,20 +42,20 @@ static int retrieve_head(git_reference **out, git_repository *repo)
 	return error;
 }
 
-static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit)
+static int append_abbreviated_oid(git_str *out, const git_oid *b_commit)
 {
 	char *formatted_oid;
 
 	formatted_oid = git_oid_allocfmt(b_commit);
 	GIT_ERROR_CHECK_ALLOC(formatted_oid);
 
-	git_buf_put(out, formatted_oid, 7);
+	git_str_put(out, formatted_oid, 7);
 	git__free(formatted_oid);
 
-	return git_buf_oom(out) ? -1 : 0;
+	return git_str_oom(out) ? -1 : 0;
 }
 
-static int append_commit_description(git_buf *out, git_commit* commit)
+static int append_commit_description(git_str *out, git_commit *commit)
 {
 	const char *summary = git_commit_summary(commit);
 	GIT_ERROR_CHECK_ALLOC(summary);
@@ -64,16 +63,16 @@ static int append_commit_description(git_buf *out, git_commit* commit)
 	if (append_abbreviated_oid(out, git_commit_id(commit)) < 0)
 		return -1;
 
-	git_buf_putc(out, ' ');
-	git_buf_puts(out, summary);
-	git_buf_putc(out, '\n');
+	git_str_putc(out, ' ');
+	git_str_puts(out, summary);
+	git_str_putc(out, '\n');
 
-	return git_buf_oom(out) ? -1 : 0;
+	return git_str_oom(out) ? -1 : 0;
 }
 
 static int retrieve_base_commit_and_message(
 	git_commit **b_commit,
-	git_buf *stash_message,
+	git_str *stash_message,
 	git_repository *repo)
 {
 	git_reference *head = NULL;
@@ -83,9 +82,9 @@ static int retrieve_base_commit_and_message(
 		return error;
 
 	if (strcmp("HEAD", git_reference_name(head)) == 0)
-		error = git_buf_puts(stash_message, "(no branch): ");
+		error = git_str_puts(stash_message, "(no branch): ");
 	else
-		error = git_buf_printf(
+		error = git_str_printf(
 			stash_message,
 			"%s: ",
 			git_reference_name(head) + strlen(GIT_REFS_HEADS_DIR));
@@ -128,13 +127,13 @@ static int commit_index(
 {
 	git_tree *i_tree = NULL;
 	git_oid i_commit_oid;
-	git_buf msg = GIT_BUF_INIT;
+	git_str msg = GIT_STR_INIT;
 	int error;
 
 	if ((error = build_tree_from_index(&i_tree, repo, index)) < 0)
 		goto cleanup;
 
-	if ((error = git_buf_printf(&msg, "index on %s\n", message)) < 0)
+	if ((error = git_str_printf(&msg, "index on %s\n", message)) < 0)
 		goto cleanup;
 
 	if ((error = git_commit_create(
@@ -144,7 +143,7 @@ static int commit_index(
 		stasher,
 		stasher,
 		NULL,
-		git_buf_cstr(&msg),
+		git_str_cstr(&msg),
 		i_tree,
 		1,
 		&parent)) < 0)
@@ -154,7 +153,7 @@ static int commit_index(
 
 cleanup:
 	git_tree_free(i_tree);
-	git_buf_dispose(&msg);
+	git_str_dispose(&msg);
 	return error;
 }
 
@@ -303,13 +302,13 @@ static int commit_untracked(
 {
 	git_tree *u_tree = NULL;
 	git_oid u_commit_oid;
-	git_buf msg = GIT_BUF_INIT;
+	git_str msg = GIT_STR_INIT;
 	int error;
 
 	if ((error = build_untracked_tree(&u_tree, repo, i_commit, flags)) < 0)
 		goto cleanup;
 
-	if ((error = git_buf_printf(&msg, "untracked files on %s\n", message)) < 0)
+	if ((error = git_str_printf(&msg, "untracked files on %s\n", message)) < 0)
 		goto cleanup;
 
 	if ((error = git_commit_create(
@@ -319,7 +318,7 @@ static int commit_untracked(
 		stasher,
 		stasher,
 		NULL,
-		git_buf_cstr(&msg),
+		git_str_cstr(&msg),
 		u_tree,
 		0,
 		NULL)) < 0)
@@ -329,7 +328,7 @@ static int commit_untracked(
 
 cleanup:
 	git_tree_free(u_tree);
-	git_buf_dispose(&msg);
+	git_str_dispose(&msg);
 	return error;
 }
 
@@ -437,33 +436,33 @@ cleanup:
 	return error;
 }
 
-static int prepare_worktree_commit_message(git_buf *out, const char *user_message)
+static int prepare_worktree_commit_message(git_str *out, const char *user_message)
 {
-	git_buf buf = GIT_BUF_INIT;
+	git_str buf = GIT_STR_INIT;
 	int error = 0;
 
 	if (!user_message) {
-		git_buf_printf(&buf, "WIP on %s", git_buf_cstr(out));
+		git_str_printf(&buf, "WIP on %s", git_str_cstr(out));
 	} else {
 		const char *colon;
 
-		if ((colon = strchr(git_buf_cstr(out), ':')) == NULL)
+		if ((colon = strchr(git_str_cstr(out), ':')) == NULL)
 			goto cleanup;
 
-		git_buf_puts(&buf, "On ");
-		git_buf_put(&buf, git_buf_cstr(out), colon - out->ptr);
-		git_buf_printf(&buf, ": %s\n", user_message);
+		git_str_puts(&buf, "On ");
+		git_str_put(&buf, git_str_cstr(out), colon - out->ptr);
+		git_str_printf(&buf, ": %s\n", user_message);
 	}
 
-	if (git_buf_oom(&buf)) {
+	if (git_str_oom(&buf)) {
 		error = -1;
 		goto cleanup;
 	}
 
-	git_buf_swap(out, &buf);
+	git_str_swap(out, &buf);
 
 cleanup:
-	git_buf_dispose(&buf);
+	git_str_dispose(&buf);
 	return error;
 }
 
@@ -543,10 +542,12 @@ int git_stash_save(
 {
 	git_index *index = NULL;
 	git_commit *b_commit = NULL, *i_commit = NULL, *u_commit = NULL;
-	git_buf msg = GIT_BUF_INIT;
+	git_str msg = GIT_STR_INIT;
 	int error;
 
-	assert(out && repo && stasher);
+	GIT_ASSERT_ARG(out);
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(stasher);
 
 	if ((error = git_repository__ensure_not_bare(repo, "stash save")) < 0)
 		return error;
@@ -561,24 +562,24 @@ int git_stash_save(
 		goto cleanup;
 
 	if ((error = commit_index(&i_commit, repo, index, stasher,
-				  git_buf_cstr(&msg), b_commit)) < 0)
+				  git_str_cstr(&msg), b_commit)) < 0)
 		goto cleanup;
 
 	if ((flags & (GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)) &&
 	    (error = commit_untracked(&u_commit, repo, stasher,
-				      git_buf_cstr(&msg), i_commit, flags)) < 0)
+				      git_str_cstr(&msg), i_commit, flags)) < 0)
 		goto cleanup;
 
 	if ((error = prepare_worktree_commit_message(&msg, message)) < 0)
 		goto cleanup;
 
-	if ((error = commit_worktree(out, repo, stasher, git_buf_cstr(&msg),
+	if ((error = commit_worktree(out, repo, stasher, git_str_cstr(&msg),
 				     i_commit, b_commit, u_commit)) < 0)
 		goto cleanup;
 
-	git_buf_rtrim(&msg);
+	git_str_rtrim(&msg);
 
-	if ((error = update_reflog(out, repo, git_buf_cstr(&msg))) < 0)
+	if ((error = update_reflog(out, repo, git_str_cstr(&msg))) < 0)
 		goto cleanup;
 
 	if ((error = reset_index_and_workdir(repo, (flags & GIT_STASH_KEEP_INDEX) ? i_commit : b_commit,
@@ -587,7 +588,7 @@ int git_stash_save(
 
 cleanup:
 
-	git_buf_dispose(&msg);
+	git_str_dispose(&msg);
 	git_commit_free(i_commit);
 	git_commit_free(b_commit);
 	git_commit_free(u_commit);

data/vendor/libgit2/src/status.c

@@ -84,7 +84,7 @@ static unsigned int workdir_delta2status(
 
 		if (!git_oid_equal(&idx2wd->old_file.id, &idx2wd->new_file.id)) {
 			/* if OIDs don't match, we might need to calculate them now to
-			 * discern between RENAMED vs RENAMED+MODIFED
+			 * discern between RENAMED vs RENAMED+MODIFIED
 			 */
 			if (git_oid_is_zero(&idx2wd->old_file.id) &&
 				diff->old_src == GIT_ITERATOR_WORKDIR &&
@@ -336,6 +336,9 @@ int git_status_list_new(
 			GIT_DIFF_FIND_RENAMES_FROM_REWRITES |
 			GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY;
 
+	if (opts != NULL && opts->rename_threshold != 0)
+		findopt.rename_threshold = opts->rename_threshold;
+
 	if (show != GIT_STATUS_SHOW_WORKDIR_ONLY) {
 		if ((error = git_diff_tree_to_index(
 				&status->head2idx, repo, head, index, &diffopt)) < 0)
@@ -391,14 +394,14 @@ done:
 
 size_t git_status_list_entrycount(git_status_list *status)
 {
-	assert(status);
+	GIT_ASSERT_ARG_WITH_RETVAL(status, 0);
 
 	return status->paired.length;
 }
 
 const git_status_entry *git_status_byindex(git_status_list *status, size_t i)
 {
-	assert(status);
+	GIT_ASSERT_ARG_WITH_RETVAL(status, NULL);
 
 	return git_vector_get(&status->paired, i);
 }
@@ -492,7 +495,9 @@ int git_status_file(
 	struct status_file_info sfi = {0};
 	git_index *index;
 
-	assert(status_flags && repo && path);
+	GIT_ASSERT_ARG(status_flags);
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(path);
 
 	if ((error = git_repository_index__weakptr(&index, repo)) < 0)
 		return error;
@@ -558,7 +563,8 @@ int git_status_init_options(git_status_options *opts, unsigned int version)
 int git_status_list_get_perfdata(
 	git_diff_perfdata *out, const git_status_list *status)
 {
-	assert(out);
+	GIT_ASSERT_ARG(out);
+
 	GIT_ERROR_CHECK_VERSION(out, GIT_DIFF_PERFDATA_VERSION, "git_diff_perfdata");
 
 	out->stat_calls = 0;