rugged 1.3.2 → 1.6.2

data/vendor/libgit2/src/{diff_stats.c → libgit2/diff_stats.c}

@@ -5,8 +5,10 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "diff_stats.h"
 
+#include "buf.h"
+#include "common.h"
 #include "vector.h"
 #include "diff.h"
 #include "patch_generate.h"
@@ -47,7 +49,7 @@ static int digits_for_value(size_t val)
 }
 
 static int diff_file_stats_full_to_buf(
-	git_buf *out,
+	git_str *out,
 	const git_diff_delta *delta,
 	const diff_file_stats *filestat,
 	const git_diff_stats *stats,
@@ -68,14 +70,14 @@ static int diff_file_stats_full_to_buf(
 
 		padding = stats->max_name - strlen(old_path) - strlen(new_path);
 
-		if ((common_dirlen = git_path_common_dirlen(old_path, new_path)) &&
+		if ((common_dirlen = git_fs_path_common_dirlen(old_path, new_path)) &&
 		    common_dirlen <= INT_MAX) {
-			error = git_buf_printf(out, " %.*s{%s"DIFF_RENAME_FILE_SEPARATOR"%s}",
+			error = git_str_printf(out, " %.*s{%s"DIFF_RENAME_FILE_SEPARATOR"%s}",
 					       (int) common_dirlen, old_path,
 					       old_path + common_dirlen,
 					       new_path + common_dirlen);
 		} else {
-			error = git_buf_printf(out, " %s" DIFF_RENAME_FILE_SEPARATOR "%s",
+			error = git_str_printf(out, " %s" DIFF_RENAME_FILE_SEPARATOR "%s",
 					       old_path, new_path);
 		}
 
@@ -83,7 +85,7 @@ static int diff_file_stats_full_to_buf(
 			goto on_error;
 	} else {
 		adddel_path = new_path ? new_path : old_path;
-		if (git_buf_printf(out, " %s", adddel_path) < 0)
+		if (git_str_printf(out, " %s", adddel_path) < 0)
 			goto on_error;
 
 		padding = stats->max_name - strlen(adddel_path);
@@ -92,28 +94,28 @@ static int diff_file_stats_full_to_buf(
 			padding += strlen(DIFF_RENAME_FILE_SEPARATOR);
 	}
 
-	if (git_buf_putcn(out, ' ', padding) < 0 ||
-		git_buf_puts(out, " | ") < 0)
+	if (git_str_putcn(out, ' ', padding) < 0 ||
+		git_str_puts(out, " | ") < 0)
 		goto on_error;
 
 	if (delta->flags & GIT_DIFF_FLAG_BINARY) {
-		if (git_buf_printf(out,
+		if (git_str_printf(out,
 				"Bin %" PRId64 " -> %" PRId64 " bytes", old_size, new_size) < 0)
 			goto on_error;
 	}
 	else {
-		if (git_buf_printf(out,
+		if (git_str_printf(out,
 				"%*" PRIuZ, stats->max_digits,
 				filestat->insertions + filestat->deletions) < 0)
 			goto on_error;
 
 		if (filestat->insertions || filestat->deletions) {
-			if (git_buf_putc(out, ' ') < 0)
+			if (git_str_putc(out, ' ') < 0)
 				goto on_error;
 
 			if (!width) {
-				if (git_buf_putcn(out, '+', filestat->insertions) < 0 ||
-					git_buf_putcn(out, '-', filestat->deletions) < 0)
+				if (git_str_putcn(out, '+', filestat->insertions) < 0 ||
+					git_str_putcn(out, '-', filestat->deletions) < 0)
 					goto on_error;
 			} else {
 				size_t total = filestat->insertions + filestat->deletions;
@@ -122,21 +124,21 @@ static int diff_file_stats_full_to_buf(
 				size_t plus = full * filestat->insertions / total;
 				size_t minus = full - plus;
 
-				if (git_buf_putcn(out, '+', max(plus,  1)) < 0 ||
-					git_buf_putcn(out, '-', max(minus, 1)) < 0)
+				if (git_str_putcn(out, '+', max(plus,  1)) < 0 ||
+					git_str_putcn(out, '-', max(minus, 1)) < 0)
 					goto on_error;
 			}
 		}
 	}
 
-	git_buf_putc(out, '\n');
+	git_str_putc(out, '\n');
 
 on_error:
-	return (git_buf_oom(out) ? -1 : 0);
+	return (git_str_oom(out) ? -1 : 0);
 }
 
 static int diff_file_stats_number_to_buf(
-	git_buf *out,
+	git_str *out,
 	const git_diff_delta *delta,
 	const diff_file_stats *filestats)
 {
@@ -144,29 +146,29 @@ static int diff_file_stats_number_to_buf(
 	const char *path = delta->new_file.path;
 
 	if (delta->flags & GIT_DIFF_FLAG_BINARY)
-		error = git_buf_printf(out, "%-8c" "%-8c" "%s\n", '-', '-', path);
+		error = git_str_printf(out, "%-8c" "%-8c" "%s\n", '-', '-', path);
 	else
-		error = git_buf_printf(out, "%-8" PRIuZ "%-8" PRIuZ "%s\n",
+		error = git_str_printf(out, "%-8" PRIuZ "%-8" PRIuZ "%s\n",
 			filestats->insertions, filestats->deletions, path);
 
 	return error;
 }
 
 static int diff_file_stats_summary_to_buf(
-	git_buf *out,
+	git_str *out,
 	const git_diff_delta *delta)
 {
 	if (delta->old_file.mode != delta->new_file.mode) {
 		if (delta->old_file.mode == 0) {
-			git_buf_printf(out, " create mode %06o %s\n",
+			git_str_printf(out, " create mode %06o %s\n",
 				delta->new_file.mode, delta->new_file.path);
 		}
 		else if (delta->new_file.mode == 0) {
-			git_buf_printf(out, " delete mode %06o %s\n",
+			git_str_printf(out, " delete mode %06o %s\n",
 				delta->old_file.mode, delta->old_file.path);
 		}
 		else {
-			git_buf_printf(out, " mode change %06o => %06o %s\n",
+			git_str_printf(out, " mode change %06o => %06o %s\n",
 				delta->old_file.mode, delta->new_file.mode, delta->new_file.path);
 		}
 	}
@@ -278,6 +280,15 @@ int git_diff_stats_to_buf(
 	const git_diff_stats *stats,
 	git_diff_stats_format_t format,
 	size_t width)
+{
+	GIT_BUF_WRAP_PRIVATE(out, git_diff__stats_to_buf, stats, format, width);
+}
+
+int git_diff__stats_to_buf(
+	git_str *out,
+	const git_diff_stats *stats,
+	git_diff_stats_format_t format,
+	size_t width)
 {
 	int error = 0;
 	size_t i;
@@ -320,23 +331,23 @@ int git_diff_stats_to_buf(
 	}
 
 	if (format & GIT_DIFF_STATS_FULL || format & GIT_DIFF_STATS_SHORT) {
-		git_buf_printf(
+		git_str_printf(
 			out, " %" PRIuZ " file%s changed",
 			stats->files_changed, stats->files_changed != 1 ? "s" : "");
 
 		if (stats->insertions || stats->deletions == 0)
-			git_buf_printf(
+			git_str_printf(
 				out, ", %" PRIuZ " insertion%s(+)",
 				stats->insertions, stats->insertions != 1 ? "s" : "");
 
 		if (stats->deletions || stats->insertions == 0)
-			git_buf_printf(
+			git_str_printf(
 				out, ", %" PRIuZ " deletion%s(-)",
 				stats->deletions, stats->deletions != 1 ? "s" : "");
 
-		git_buf_putc(out, '\n');
+		git_str_putc(out, '\n');
 
-		if (git_buf_oom(out))
+		if (git_str_oom(out))
 			return -1;
 	}
 

data/vendor/libgit2/src/libgit2/diff_stats.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_diff_stats_h__
+#define INCLUDE_diff_stats_h__
+
+#include "common.h"
+
+int git_diff__stats_to_buf(
+	git_str *out,
+	const git_diff_stats *stats,
+	git_diff_stats_format_t format,
+	size_t width);
+
+#endif

data/vendor/libgit2/src/{diff_tform.c → libgit2/diff_tform.c}

@@ -13,7 +13,7 @@
 
 #include "diff.h"
 #include "diff_generate.h"
-#include "path.h"
+#include "fs_path.h"
 #include "futils.h"
 #include "config.h"
 
@@ -241,7 +241,7 @@ int git_diff_find_similar__calc_similarity(
 
 #define DEFAULT_THRESHOLD 50
 #define DEFAULT_BREAK_REWRITE_THRESHOLD 60
-#define DEFAULT_RENAME_LIMIT 200
+#define DEFAULT_RENAME_LIMIT 1000
 
 static int normalize_find_opts(
 	git_diff *diff,
@@ -364,6 +364,7 @@ static int insert_delete_side_of_split(
 	memset(&deleted->new_file, 0, sizeof(deleted->new_file));
 	deleted->new_file.path = deleted->old_file.path;
 	deleted->new_file.flags |= GIT_DIFF_FLAG_VALID_ID;
+	git_oid_clear(&deleted->new_file.id, GIT_OID_SHA1);
 
 	return git_vector_insert(onto, deleted);
 }
@@ -375,7 +376,7 @@ static int apply_splits_and_deletes(
 	size_t i;
 	git_diff_delta *delta;
 
-	if (git_vector_init(&onto, expected_size, git_diff_delta__cmp) < 0)
+	if (git_vector_init(&onto, expected_size, diff->deltas._cmp) < 0)
 		return -1;
 
 	/* build new delta list without TO_DELETE and splitting TO_SPLIT */
@@ -397,6 +398,7 @@ static int apply_splits_and_deletes(
 			memset(&delta->old_file, 0, sizeof(delta->old_file));
 			delta->old_file.path = delta->new_file.path;
 			delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
+			git_oid_clear(&delta->old_file.id, GIT_OID_SHA1);
 		}
 
 		/* clean up delta before inserting into new list */
@@ -444,7 +446,7 @@ typedef struct {
 	git_iterator_t src;
 	git_repository *repo;
 	git_diff_file *file;
-	git_buf data;
+	git_str data;
 	git_odb_object *odb_obj;
 	git_blob *blob;
 } similarity_info;
@@ -458,9 +460,10 @@ static int similarity_init(
 	info->file = similarity_get_file(diff, file_idx);
 	info->odb_obj = NULL;
 	info->blob = NULL;
-	git_buf_init(&info->data, 0);
+	git_str_init(&info->data, 0);
 
-	if (info->file->size > 0 || info->src == GIT_ITERATOR_WORKDIR)
+	if ((info->file->flags & GIT_DIFF_FLAG_VALID_SIZE) ||
+	    info->src == GIT_ITERATOR_WORKDIR)
 		return 0;
 
 	return git_diff_file__resolve_zero_size(
@@ -481,7 +484,7 @@ static int similarity_sig(
 			return error;
 
 		/* if path is not a regular file, just skip this item */
-		if (!git_path_isfile(info->data.ptr))
+		if (!git_fs_path_isfile(info->data.ptr))
 			return 0;
 
 		/* TODO: apply wd-to-odb filters to file data if necessary */
@@ -529,7 +532,7 @@ static void similarity_unload(similarity_info *info)
 	if (info->blob)
 		git_blob_free(info->blob);
 	else
-		git_buf_dispose(&info->data);
+		git_str_dispose(&info->data);
 }
 
 #define FLAG_SET(opts,flag_name) (((opts)->flags & flag_name) != 0)
@@ -994,6 +997,7 @@ find_best_matches:
 				memset(&src->new_file, 0, sizeof(src->new_file));
 				src->new_file.path = src->old_file.path;
 				src->new_file.flags |= GIT_DIFF_FLAG_VALID_ID;
+				git_oid_clear(&src->new_file.id, GIT_OID_SHA1);
 
 				num_updates++;
 
@@ -1019,6 +1023,7 @@ find_best_matches:
 				memset(&src->old_file, 0, sizeof(src->old_file));
 				src->old_file.path = src->new_file.path;
 				src->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
+				git_oid_clear(&src->old_file.id, GIT_OID_SHA1);
 
 				src->flags &= ~GIT_DIFF_FLAG__TO_SPLIT;
 				num_rewrites--;

data/vendor/libgit2/src/{diff_xdiff.c → libgit2/diff_xdiff.c}

@@ -11,6 +11,7 @@
 #include "diff.h"
 #include "diff_driver.h"
 #include "patch_generate.h"
+#include "utf8.h"
 
 static int git_xdiff_scan_int(const char **str, int *value)
 {
@@ -218,14 +219,9 @@ static int git_xdiff(git_patch_generated_output *output, git_patch_generated *pa
 	 * updates are needed to xo->params.flags
 	 */
 
-	git_patch_generated_old_data(&info.xd_old_data.ptr, &info.xd_old_data.size, patch);
-	git_patch_generated_new_data(&info.xd_new_data.ptr, &info.xd_new_data.size, patch);
-
-	if (info.xd_old_data.size > GIT_XDIFF_MAX_SIZE ||
-		info.xd_new_data.size > GIT_XDIFF_MAX_SIZE) {
-		git_error_set(GIT_ERROR_INVALID, "files too large for diff");
+	if (git_patch_generated_old_data(&info.xd_old_data.ptr, &info.xd_old_data.size, patch) < 0 ||
+	    git_patch_generated_new_data(&info.xd_new_data.ptr, &info.xd_new_data.size, patch) < 0)
 		return -1;
-	}
 
 	xdl_diff(&info.xd_old_data, &info.xd_new_data,
 		&xo->params, &xo->config, &xo->callback);
@@ -261,5 +257,5 @@ void git_xdiff_init(git_xdiff_output *xo, const git_diff_options *opts)
 	if (flags & GIT_DIFF_IGNORE_BLANK_LINES)
 		xo->params.flags |= XDF_IGNORE_BLANK_LINES;
 
-	xo->callback.outf = git_xdiff_cb;
+	xo->callback.out_line = git_xdiff_cb;
 }

data/vendor/libgit2/src/{email.c → libgit2/email.c}

@@ -7,9 +7,12 @@
 
 #include "email.h"
 
-#include "buffer.h"
 #include "common.h"
+#include "buf.h"
 #include "diff_generate.h"
+#include "diff_stats.h"
+#include "patch.h"
+#include "date.h"
 
 #include "git2/email.h"
 #include "git2/patch.h"
@@ -32,7 +35,7 @@ GIT_INLINE(int) include_prefix(
 }
 
 static int append_prefix(
-	git_buf *out,
+	git_str *out,
 	size_t patch_idx,
 	size_t patch_count,
 	git_email_create_options *opts)
@@ -40,16 +43,16 @@ static int append_prefix(
 	const char *subject_prefix = opts->subject_prefix ?
 		opts->subject_prefix : "PATCH";
 
-	git_buf_putc(out, '[');
+	git_str_putc(out, '[');
 
 	if (*subject_prefix)
-		git_buf_puts(out, subject_prefix);
+		git_str_puts(out, subject_prefix);
 
 	if (opts->reroll_number) {
 		if (*subject_prefix)
-			git_buf_putc(out, ' ');
+			git_str_putc(out, ' ');
 
-		git_buf_printf(out, "v%" PRIuZ, opts->reroll_number);
+		git_str_printf(out, "v%" PRIuZ, opts->reroll_number);
 	}
 
 	if ((opts->flags & GIT_EMAIL_CREATE_ALWAYS_NUMBER) != 0 ||
@@ -58,20 +61,33 @@ static int append_prefix(
 			opts->start_number : 1;
 
 		if (*subject_prefix || opts->reroll_number)
-			git_buf_putc(out, ' ');
+			git_str_putc(out, ' ');
 
-		git_buf_printf(out, "%" PRIuZ "/%" PRIuZ,
+		git_str_printf(out, "%" PRIuZ "/%" PRIuZ,
 		               patch_idx + (start_number - 1),
 		               patch_count + (start_number - 1));
 	}
 
-	git_buf_puts(out, "]");
+	git_str_puts(out, "]");
 
-	return git_buf_oom(out) ? -1 : 0;
+	return git_str_oom(out) ? -1 : 0;
+}
+
+static int append_date(
+	git_str *out,
+	const git_time *date)
+{
+	int error;
+
+	if ((error = git_str_printf(out, "Date: ")) == 0 &&
+	    (error = git_date_rfc2822_fmt(out, date->time, date->offset)) == 0)
+	    error = git_str_putc(out, '\n');
+
+	return error;
 }
 
 static int append_subject(
-	git_buf *out,
+	git_str *out,
 	size_t patch_idx,
 	size_t patch_count,
 	const char *summary,
@@ -88,25 +104,25 @@ static int append_subject(
 			summary_len = (nl - summary);
 	}
 
-	if ((error = git_buf_puts(out, "Subject: ")) < 0)
+	if ((error = git_str_puts(out, "Subject: ")) < 0)
 		return error;
 
 	if (prefix &&
 	    (error = append_prefix(out, patch_idx, patch_count, opts)) < 0)
 		return error;
 
-	if (prefix && summary_len && (error = git_buf_putc(out, ' ')) < 0)
+	if (prefix && summary_len && (error = git_str_putc(out, ' ')) < 0)
 		return error;
 
 	if (summary_len &&
-	    (error = git_buf_put(out, summary, summary_len)) < 0)
+	    (error = git_str_put(out, summary, summary_len)) < 0)
 		return error;
 
-	return git_buf_putc(out, '\n');
+	return git_str_putc(out, '\n');
 }
 
 static int append_header(
-	git_buf *out,
+	git_str *out,
 	size_t patch_idx,
 	size_t patch_count,
 	const git_oid *commit_id,
@@ -114,25 +130,23 @@ static int append_header(
 	const git_signature *author,
 	git_email_create_options *opts)
 {
-	char id[GIT_OID_HEXSZ];
-	char date[GIT_DATE_RFC2822_SZ];
+	char id[GIT_OID_SHA1_HEXSIZE];
 	int error;
 
 	if ((error = git_oid_fmt(id, commit_id)) < 0 ||
-	    (error = git_buf_printf(out, "From %.*s %s\n", GIT_OID_HEXSZ, id, EMAIL_TIMESTAMP)) < 0 ||
-	    (error = git_buf_printf(out, "From: %s <%s>\n", author->name, author->email)) < 0 ||
-	    (error = git__date_rfc2822_fmt(date, sizeof(date), &author->when)) < 0 ||
-	    (error = git_buf_printf(out, "Date: %s\n", date)) < 0 ||
+	    (error = git_str_printf(out, "From %.*s %s\n", GIT_OID_SHA1_HEXSIZE, id, EMAIL_TIMESTAMP)) < 0 ||
+	    (error = git_str_printf(out, "From: %s <%s>\n", author->name, author->email)) < 0 ||
+	    (error = append_date(out, &author->when)) < 0 ||
 	    (error = append_subject(out, patch_idx, patch_count, summary, opts)) < 0)
 		return error;
 
-	if ((error = git_buf_putc(out, '\n')) < 0)
+	if ((error = git_str_putc(out, '\n')) < 0)
 		return error;
 
 	return 0;
 }
 
-static int append_body(git_buf *out, const char *body)
+static int append_body(git_str *out, const char *body)
 {
 	size_t body_len;
 	int error;
@@ -142,16 +156,16 @@ static int append_body(git_buf *out, const char *body)
 
 	body_len = strlen(body);
 
-	if ((error = git_buf_puts(out, body)) < 0)
+	if ((error = git_str_puts(out, body)) < 0)
 		return error;
 
 	if (body_len && body[body_len - 1] != '\n')
-		error = git_buf_putc(out, '\n');
+		error = git_str_putc(out, '\n');
 
 	return error;
 }
 
-static int append_diffstat(git_buf *out, git_diff *diff)
+static int append_diffstat(git_str *out, git_diff *diff)
 {
 	git_diff_stats *stats = NULL;
 	unsigned int format_flags;
@@ -160,14 +174,14 @@ static int append_diffstat(git_buf *out, git_diff *diff)
 	format_flags = GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_INCLUDE_SUMMARY;
 
 	if ((error = git_diff_get_stats(&stats, diff)) == 0 &&
-	    (error = git_diff_stats_to_buf(out, stats, format_flags, 0)) == 0)
-		error = git_buf_putc(out, '\n');
+	    (error = git_diff__stats_to_buf(out, stats, format_flags, 0)) == 0)
+		error = git_str_putc(out, '\n');
 
 	git_diff_stats_free(stats);
 	return error;
 }
 
-static int append_patches(git_buf *out, git_diff *diff)
+static int append_patches(git_str *out, git_diff *diff)
 {
 	size_t i, deltas;
 	int error = 0;
@@ -178,7 +192,7 @@ static int append_patches(git_buf *out, git_diff *diff)
 		git_patch *patch = NULL;
 
 		if ((error = git_patch_from_diff(&patch, diff, i)) >= 0)
-			error = git_patch_to_buf(out, patch);
+			error = git_patch__to_buf(out, patch);
 
 		git_patch_free(patch);
 
@@ -190,7 +204,7 @@ static int append_patches(git_buf *out, git_diff *diff)
 }
 
 int git_email__append_from_diff(
-	git_buf *out,
+	git_str *out,
 	git_diff *diff,
 	size_t patch_idx,
 	size_t patch_count,
@@ -216,14 +230,12 @@ int git_email__append_from_diff(
 	if (given_opts)
 		memcpy(&opts, given_opts, sizeof(git_email_create_options));
 
-	git_buf_sanitize(out);
-
 	if ((error = append_header(out, patch_idx, patch_count, commit_id, summary, author, &opts)) == 0 &&
 	    (error = append_body(out, body)) == 0 &&
-	    (error = git_buf_puts(out, "---\n")) == 0 &&
+	    (error = git_str_puts(out, "---\n")) == 0 &&
 	    (error = append_diffstat(out, diff)) == 0 &&
 	    (error = append_patches(out, diff)) == 0)
-		error = git_buf_puts(out, "--\nlibgit2 " LIBGIT2_VERSION "\n\n");
+		error = git_str_puts(out, "--\nlibgit2 " LIBGIT2_VERSION "\n\n");
 
 	return error;
 }
@@ -239,15 +251,19 @@ int git_email_create_from_diff(
 	const git_signature *author,
 	const git_email_create_options *given_opts)
 {
+	git_str email = GIT_STR_INIT;
 	int error;
 
-	git_buf_sanitize(out);
-	git_buf_clear(out);
+	git_buf_tostr(&email, out);
 
-	error = git_email__append_from_diff(out, diff, patch_idx,
+	error = git_email__append_from_diff(&email, diff, patch_idx,
 		patch_count, commit_id, summary, body, author,
 		given_opts);
 
+	if (error == 0)
+		error = git_buf_fromstr(out, &email);
+
+	git_str_dispose(&email);
 	return error;
 }
 

data/vendor/libgit2/src/{email.h → libgit2/email.h}

@@ -12,7 +12,7 @@
 #include "git2/email.h"
 
 extern int git_email__append_from_diff(
-	git_buf *out,
+	git_str *out,
 	git_diff *diff,
 	size_t patch_idx,
 	size_t patch_count,

data/vendor/libgit2/src/{errors.c → libgit2/errors.c}

@@ -9,7 +9,7 @@
 
 #include "threadstate.h"
 #include "posix.h"
-#include "buffer.h"
+#include "str.h"
 #include "libgit2.h"
 
 /********************************************
@@ -29,7 +29,7 @@ static git_error g_git_uninitialized_error = {
 static void set_error_from_buffer(int error_class)
 {
 	git_error *error = &GIT_THREADSTATE->error_t;
-	git_buf *buf = &GIT_THREADSTATE->error_buf;
+	git_str *buf = &GIT_THREADSTATE->error_buf;
 
 	error->message = buf->ptr;
 	error->klass = error_class;
@@ -39,11 +39,11 @@ static void set_error_from_buffer(int error_class)
 
 static void set_error(int error_class, char *string)
 {
-	git_buf *buf = &GIT_THREADSTATE->error_buf;
+	git_str *buf = &GIT_THREADSTATE->error_buf;
 
-	git_buf_clear(buf);
+	git_str_clear(buf);
 	if (string) {
-		git_buf_puts(buf, string);
+		git_str_puts(buf, string);
 		git__free(string);
 	}
 
@@ -70,20 +70,20 @@ void git_error_vset(int error_class, const char *fmt, va_list ap)
 	DWORD win32_error_code = (error_class == GIT_ERROR_OS) ? GetLastError() : 0;
 #endif
 	int error_code = (error_class == GIT_ERROR_OS) ? errno : 0;
-	git_buf *buf = &GIT_THREADSTATE->error_buf;
+	git_str *buf = &GIT_THREADSTATE->error_buf;
 
-	git_buf_clear(buf);
+	git_str_clear(buf);
 	if (fmt) {
-		git_buf_vprintf(buf, fmt, ap);
+		git_str_vprintf(buf, fmt, ap);
 		if (error_class == GIT_ERROR_OS)
-			git_buf_PUTS(buf, ": ");
+			git_str_PUTS(buf, ": ");
 	}
 
 	if (error_class == GIT_ERROR_OS) {
 #ifdef GIT_WIN32
 		char * win32_error = git_win32_get_error_message(win32_error_code);
 		if (win32_error) {
-			git_buf_puts(buf, win32_error);
+			git_str_puts(buf, win32_error);
 			git__free(win32_error);
 
 			SetLastError(0);
@@ -91,26 +91,26 @@ void git_error_vset(int error_class, const char *fmt, va_list ap)
 		else
 #endif
 		if (error_code)
-			git_buf_puts(buf, strerror(error_code));
+			git_str_puts(buf, strerror(error_code));
 
 		if (error_code)
 			errno = 0;
 	}
 
-	if (!git_buf_oom(buf))
+	if (!git_str_oom(buf))
 		set_error_from_buffer(error_class);
 }
 
 int git_error_set_str(int error_class, const char *string)
 {
-	git_buf *buf = &GIT_THREADSTATE->error_buf;
+	git_str *buf = &GIT_THREADSTATE->error_buf;
 
 	GIT_ASSERT_ARG(string);
 
-	git_buf_clear(buf);
-	git_buf_puts(buf, string);
+	git_str_clear(buf);
+	git_str_puts(buf, string);
 
-	if (git_buf_oom(buf))
+	if (git_str_oom(buf))
 		return -1;
 
 	set_error_from_buffer(error_class);
@@ -142,7 +142,7 @@ const git_error *git_error_last(void)
 int git_error_state_capture(git_error_state *state, int error_code)
 {
 	git_error *error = GIT_THREADSTATE->last_error;
-	git_buf *error_buf = &GIT_THREADSTATE->error_buf;
+	git_str *error_buf = &GIT_THREADSTATE->error_buf;
 
 	memset(state, 0, sizeof(git_error_state));
 
@@ -158,7 +158,7 @@ int git_error_state_capture(git_error_state *state, int error_code)
 		if (state->oom)
 			state->error_msg.message = g_git_oom_error.message;
 		else
-			state->error_msg.message = git_buf_detach(error_buf);
+			state->error_msg.message = git_str_detach(error_buf);
 	}
 
 	git_error_clear();