rugged 1.3.2.3 → 1.4.2

data/vendor/libgit2/src/submodule.h

@@ -110,7 +110,7 @@ enum {
 	GIT_SUBMODULE_STATUS__HEAD_NOT_SUBMODULE  = (1u << 24),
 	GIT_SUBMODULE_STATUS__INDEX_NOT_SUBMODULE = (1u << 25),
 	GIT_SUBMODULE_STATUS__WD_NOT_SUBMODULE    = (1u << 26),
-	GIT_SUBMODULE_STATUS__INDEX_MULTIPLE_ENTRIES = (1u << 27),
+	GIT_SUBMODULE_STATUS__INDEX_MULTIPLE_ENTRIES = (1u << 27)
 };
 
 #define GIT_SUBMODULE_STATUS__CLEAR_INTERNAL(S) \

data/vendor/libgit2/src/sysdir.c

@@ -8,8 +8,8 @@
 #include "sysdir.h"
 
 #include "runtime.h"
-#include "buffer.h"
-#include "path.h"
+#include "str.h"
+#include "fs_path.h"
 #include <ctype.h>
 #if GIT_WIN32
 #include "win32/findfile.h"
@@ -18,27 +18,27 @@
 #include <pwd.h>
 #endif
 
-static int git_sysdir_guess_programdata_dirs(git_buf *out)
+static int git_sysdir_guess_programdata_dirs(git_str *out)
 {
 #ifdef GIT_WIN32
 	return git_win32__find_programdata_dirs(out);
 #else
-	git_buf_clear(out);
+	git_str_clear(out);
 	return 0;
 #endif
 }
 
-static int git_sysdir_guess_system_dirs(git_buf *out)
+static int git_sysdir_guess_system_dirs(git_str *out)
 {
 #ifdef GIT_WIN32
-	return git_win32__find_system_dirs(out, L"etc\\");
+	return git_win32__find_system_dirs(out, "etc");
 #else
-	return git_buf_sets(out, "/etc");
+	return git_str_sets(out, "/etc");
 #endif
 }
 
 #ifndef GIT_WIN32
-static int get_passwd_home(git_buf *out, uid_t uid)
+static int get_passwd_home(git_str *out, uid_t uid)
 {
 	struct passwd pwd, *pwdptr;
 	char *buf = NULL;
@@ -66,7 +66,7 @@ static int get_passwd_home(git_buf *out, uid_t uid)
 		goto out;
 	}
 
-	if ((error = git_buf_puts(out, pwdptr->pw_dir)) < 0)
+	if ((error = git_str_puts(out, pwdptr->pw_dir)) < 0)
 		goto out;
 
 out:
@@ -75,7 +75,7 @@ out:
 }
 #endif
 
-static int git_sysdir_guess_global_dirs(git_buf *out)
+static int git_sysdir_guess_global_dirs(git_str *out)
 {
 #ifdef GIT_WIN32
 	return git_win32__find_global_dirs(out);
@@ -114,12 +114,12 @@ static int git_sysdir_guess_global_dirs(git_buf *out)
 #endif
 }
 
-static int git_sysdir_guess_xdg_dirs(git_buf *out)
+static int git_sysdir_guess_xdg_dirs(git_str *out)
 {
 #ifdef GIT_WIN32
 	return git_win32__find_xdg_dirs(out);
 #else
-	git_buf env = GIT_BUF_INIT;
+	git_str env = GIT_STR_INIT;
 	int error;
 	uid_t uid, euid;
 
@@ -132,13 +132,13 @@ static int git_sysdir_guess_xdg_dirs(git_buf *out)
 	 */
 	if (uid == euid) {
 		if ((error = git__getenv(&env, "XDG_CONFIG_HOME")) == 0)
-			error = git_buf_joinpath(out, env.ptr, "git");
+			error = git_str_joinpath(out, env.ptr, "git");
 
 		if (error == GIT_ENOTFOUND && (error = git__getenv(&env, "HOME")) == 0)
-			error = git_buf_joinpath(out, env.ptr, ".config/git");
+			error = git_str_joinpath(out, env.ptr, ".config/git");
 	} else {
 		if ((error = get_passwd_home(&env, euid)) == 0)
-			error = git_buf_joinpath(out, env.ptr, ".config/git");
+			error = git_str_joinpath(out, env.ptr, ".config/git");
 	}
 
 	if (error == GIT_ENOTFOUND) {
@@ -146,31 +146,31 @@ static int git_sysdir_guess_xdg_dirs(git_buf *out)
 		error = 0;
 	}
 
-	git_buf_dispose(&env);
+	git_str_dispose(&env);
 	return error;
 #endif
 }
 
-static int git_sysdir_guess_template_dirs(git_buf *out)
+static int git_sysdir_guess_template_dirs(git_str *out)
 {
 #ifdef GIT_WIN32
-	return git_win32__find_system_dirs(out, L"share\\git-core\\templates");
+	return git_win32__find_system_dirs(out, "share/git-core/templates");
 #else
-	return git_buf_sets(out, "/usr/share/git-core/templates");
+	return git_str_sets(out, "/usr/share/git-core/templates");
 #endif
 }
 
 struct git_sysdir__dir {
-	git_buf buf;
-	int (*guess)(git_buf *out);
+	git_str buf;
+	int (*guess)(git_str *out);
 };
 
 static struct git_sysdir__dir git_sysdir__dirs[] = {
-	{ GIT_BUF_INIT, git_sysdir_guess_system_dirs },
-	{ GIT_BUF_INIT, git_sysdir_guess_global_dirs },
-	{ GIT_BUF_INIT, git_sysdir_guess_xdg_dirs },
-	{ GIT_BUF_INIT, git_sysdir_guess_programdata_dirs },
-	{ GIT_BUF_INIT, git_sysdir_guess_template_dirs },
+	{ GIT_STR_INIT, git_sysdir_guess_system_dirs },
+	{ GIT_STR_INIT, git_sysdir_guess_global_dirs },
+	{ GIT_STR_INIT, git_sysdir_guess_xdg_dirs },
+	{ GIT_STR_INIT, git_sysdir_guess_programdata_dirs },
+	{ GIT_STR_INIT, git_sysdir_guess_template_dirs },
 };
 
 static void git_sysdir_global_shutdown(void)
@@ -178,7 +178,7 @@ static void git_sysdir_global_shutdown(void)
 	size_t i;
 
 	for (i = 0; i < ARRAY_SIZE(git_sysdir__dirs); ++i)
-		git_buf_dispose(&git_sysdir__dirs[i].buf);
+		git_str_dispose(&git_sysdir__dirs[i].buf);
 }
 
 int git_sysdir_global_init(void)
@@ -189,9 +189,25 @@ int git_sysdir_global_init(void)
 	for (i = 0; !error && i < ARRAY_SIZE(git_sysdir__dirs); i++)
 		error = git_sysdir__dirs[i].guess(&git_sysdir__dirs[i].buf);
 
+	if (error)
+		return error;
+
 	return git_runtime_shutdown_register(git_sysdir_global_shutdown);
 }
 
+int git_sysdir_reset(void)
+{
+	size_t i;
+	int error = 0;
+
+	for (i = 0; !error && i < ARRAY_SIZE(git_sysdir__dirs); ++i) {
+		git_str_dispose(&git_sysdir__dirs[i].buf);
+		error = git_sysdir__dirs[i].guess(&git_sysdir__dirs[i].buf);
+	}
+
+	return error;
+}
+
 static int git_sysdir_check_selector(git_sysdir_t which)
 {
 	if (which < ARRAY_SIZE(git_sysdir__dirs))
@@ -202,7 +218,7 @@ static int git_sysdir_check_selector(git_sysdir_t which)
 }
 
 
-int git_sysdir_get(const git_buf **out, git_sysdir_t which)
+int git_sysdir_get(const git_str **out, git_sysdir_t which)
 {
 	GIT_ASSERT_ARG(out);
 
@@ -219,7 +235,7 @@ int git_sysdir_get(const git_buf **out, git_sysdir_t which)
 int git_sysdir_set(git_sysdir_t which, const char *search_path)
 {
 	const char *expand_path = NULL;
-	git_buf merge = GIT_BUF_INIT;
+	git_str merge = GIT_STR_INIT;
 
 	GIT_ERROR_CHECK_ERROR(git_sysdir_check_selector(which));
 
@@ -233,48 +249,48 @@ int git_sysdir_set(git_sysdir_t which, const char *search_path)
 	/* if $PATH is not referenced, then just set the path */
 	if (!expand_path) {
 		if (search_path)
-			git_buf_sets(&git_sysdir__dirs[which].buf, search_path);
+			git_str_sets(&git_sysdir__dirs[which].buf, search_path);
 
 		goto done;
 	}
 
 	/* otherwise set to join(before $PATH, old value, after $PATH) */
 	if (expand_path > search_path)
-		git_buf_set(&merge, search_path, expand_path - search_path);
+		git_str_set(&merge, search_path, expand_path - search_path);
 
-	if (git_buf_len(&git_sysdir__dirs[which].buf))
-		git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR,
+	if (git_str_len(&git_sysdir__dirs[which].buf))
+		git_str_join(&merge, GIT_PATH_LIST_SEPARATOR,
 			merge.ptr, git_sysdir__dirs[which].buf.ptr);
 
 	expand_path += strlen(PATH_MAGIC);
 	if (*expand_path)
-		git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR, merge.ptr, expand_path);
+		git_str_join(&merge, GIT_PATH_LIST_SEPARATOR, merge.ptr, expand_path);
 
-	git_buf_swap(&git_sysdir__dirs[which].buf, &merge);
-	git_buf_dispose(&merge);
+	git_str_swap(&git_sysdir__dirs[which].buf, &merge);
+	git_str_dispose(&merge);
 
 done:
-	if (git_buf_oom(&git_sysdir__dirs[which].buf))
+	if (git_str_oom(&git_sysdir__dirs[which].buf))
 		return -1;
 
 	return 0;
 }
 
 static int git_sysdir_find_in_dirlist(
-	git_buf *path,
+	git_str *path,
 	const char *name,
 	git_sysdir_t which,
 	const char *label)
 {
 	size_t len;
 	const char *scan, *next = NULL;
-	const git_buf *syspath;
+	const git_str *syspath;
 
 	GIT_ERROR_CHECK_ERROR(git_sysdir_get(&syspath, which));
-	if (!syspath || !git_buf_len(syspath))
+	if (!syspath || !git_str_len(syspath))
 		goto done;
 
-	for (scan = git_buf_cstr(syspath); scan; scan = next) {
+	for (scan = git_str_cstr(syspath); scan; scan = next) {
 		/* find unescaped separator or end of string */
 		for (next = scan; *next; ++next) {
 			if (*next == GIT_PATH_LIST_SEPARATOR &&
@@ -287,11 +303,11 @@ static int git_sysdir_find_in_dirlist(
 		if (!len)
 			continue;
 
-		GIT_ERROR_CHECK_ERROR(git_buf_set(path, scan, len));
+		GIT_ERROR_CHECK_ERROR(git_str_set(path, scan, len));
 		if (name)
-			GIT_ERROR_CHECK_ERROR(git_buf_joinpath(path, path->ptr, name));
+			GIT_ERROR_CHECK_ERROR(git_str_joinpath(path, path->ptr, name));
 
-		if (git_path_exists(path->ptr))
+		if (git_fs_path_exists(path->ptr))
 			return 0;
 	}
 
@@ -300,47 +316,47 @@ done:
 		git_error_set(GIT_ERROR_OS, "the %s file '%s' doesn't exist", label, name);
 	else
 		git_error_set(GIT_ERROR_OS, "the %s directory doesn't exist", label);
-	git_buf_dispose(path);
+	git_str_dispose(path);
 	return GIT_ENOTFOUND;
 }
 
-int git_sysdir_find_system_file(git_buf *path, const char *filename)
+int git_sysdir_find_system_file(git_str *path, const char *filename)
 {
 	return git_sysdir_find_in_dirlist(
 		path, filename, GIT_SYSDIR_SYSTEM, "system");
 }
 
-int git_sysdir_find_global_file(git_buf *path, const char *filename)
+int git_sysdir_find_global_file(git_str *path, const char *filename)
 {
 	return git_sysdir_find_in_dirlist(
 		path, filename, GIT_SYSDIR_GLOBAL, "global");
 }
 
-int git_sysdir_find_xdg_file(git_buf *path, const char *filename)
+int git_sysdir_find_xdg_file(git_str *path, const char *filename)
 {
 	return git_sysdir_find_in_dirlist(
 		path, filename, GIT_SYSDIR_XDG, "global/xdg");
 }
 
-int git_sysdir_find_programdata_file(git_buf *path, const char *filename)
+int git_sysdir_find_programdata_file(git_str *path, const char *filename)
 {
 	return git_sysdir_find_in_dirlist(
 		path, filename, GIT_SYSDIR_PROGRAMDATA, "ProgramData");
 }
 
-int git_sysdir_find_template_dir(git_buf *path)
+int git_sysdir_find_template_dir(git_str *path)
 {
 	return git_sysdir_find_in_dirlist(
 		path, NULL, GIT_SYSDIR_TEMPLATE, "template");
 }
 
-int git_sysdir_expand_global_file(git_buf *path, const char *filename)
+int git_sysdir_expand_global_file(git_str *path, const char *filename)
 {
 	int error;
 
 	if ((error = git_sysdir_find_global_file(path, NULL)) == 0) {
 		if (filename)
-			error = git_buf_joinpath(path, path->ptr, filename);
+			error = git_str_joinpath(path, path->ptr, filename);
 	}
 
 	return error;

data/vendor/libgit2/src/sysdir.h

@@ -10,7 +10,7 @@
 #include "common.h"
 
 #include "posix.h"
-#include "buffer.h"
+#include "str.h"
 
 /**
  * Find a "global" file (i.e. one in a user's home directory).
@@ -19,7 +19,7 @@
  * @param filename name of file to find in the home directory
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_global_file(git_buf *path, const char *filename);
+extern int git_sysdir_find_global_file(git_str *path, const char *filename);
 
 /**
  * Find an "XDG" file (i.e. one in user's XDG config path).
@@ -28,7 +28,7 @@ extern int git_sysdir_find_global_file(git_buf *path, const char *filename);
  * @param filename name of file to find in the home directory
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_xdg_file(git_buf *path, const char *filename);
+extern int git_sysdir_find_xdg_file(git_str *path, const char *filename);
 
 /**
  * Find a "system" file (i.e. one shared for all users of the system).
@@ -37,7 +37,7 @@ extern int git_sysdir_find_xdg_file(git_buf *path, const char *filename);
  * @param filename name of file to find in the home directory
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_system_file(git_buf *path, const char *filename);
+extern int git_sysdir_find_system_file(git_str *path, const char *filename);
 
 /**
  * Find a "ProgramData" file (i.e. one in %PROGRAMDATA%)
@@ -46,7 +46,7 @@ extern int git_sysdir_find_system_file(git_buf *path, const char *filename);
  * @param filename name of file to find in the ProgramData directory
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_programdata_file(git_buf *path, const char *filename);
+extern int git_sysdir_find_programdata_file(git_str *path, const char *filename);
 
 /**
  * Find template directory.
@@ -54,7 +54,7 @@ extern int git_sysdir_find_programdata_file(git_buf *path, const char *filename)
  * @param path buffer to write the full path into
  * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error
  */
-extern int git_sysdir_find_template_dir(git_buf *path);
+extern int git_sysdir_find_template_dir(git_str *path);
 
 /**
  * Expand the name of a "global" file (i.e. one in a user's home
@@ -66,7 +66,7 @@ extern int git_sysdir_find_template_dir(git_buf *path);
  * @param filename name of file in the home directory
  * @return 0 on success or -1 on error
  */
-extern int git_sysdir_expand_global_file(git_buf *path, const char *filename);
+extern int git_sysdir_expand_global_file(git_str *path, const char *filename);
 
 typedef enum {
 	GIT_SYSDIR_SYSTEM = 0,
@@ -74,7 +74,7 @@ typedef enum {
 	GIT_SYSDIR_XDG    = 2,
 	GIT_SYSDIR_PROGRAMDATA = 3,
 	GIT_SYSDIR_TEMPLATE = 4,
-	GIT_SYSDIR__MAX   = 5,
+	GIT_SYSDIR__MAX   = 5
 } git_sysdir_t;
 
 /**
@@ -87,11 +87,11 @@ extern int git_sysdir_global_init(void);
 /**
  * Get the search path for global/system/xdg files
  *
- * @param out pointer to git_buf containing search path
+ * @param out pointer to git_str containing search path
  * @param which which list of paths to return
  * @return 0 on success, <0 on failure
  */
-extern int git_sysdir_get(const git_buf **out, git_sysdir_t which);
+extern int git_sysdir_get(const git_str **out, git_sysdir_t which);
 
 /**
  * Set search paths for global/system/xdg files
@@ -105,4 +105,9 @@ extern int git_sysdir_get(const git_buf **out, git_sysdir_t which);
  */
 extern int git_sysdir_set(git_sysdir_t which, const char *paths);
 
+/**
+ * Reset search paths for global/system/xdg files.
+ */
+extern int git_sysdir_reset(void);
+
 #endif

data/vendor/libgit2/src/tag.c

@@ -9,7 +9,6 @@
 
 #include "commit.h"
 #include "signature.h"
-#include "message.h"
 #include "wildmatch.h"
 #include "git2/object.h"
 #include "git2/repository.h"
@@ -63,7 +62,7 @@ const char *git_tag_message(const git_tag *t)
 static int tag_error(const char *str)
 {
 	git_error_set(GIT_ERROR_TAG, "failed to parse tag: %s", str);
-	return -1;
+	return GIT_EINVALID;
 }
 
 static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
@@ -74,6 +73,7 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 	size_t text_len, alloc_len;
 	const char *search;
 	unsigned int i;
+	int error;
 
 	if (git_oid__parse(&tag->target, &buffer, buffer_end, "object ") < 0)
 		return tag_error("object field invalid");
@@ -131,8 +131,8 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 		tag->tagger = git__malloc(sizeof(git_signature));
 		GIT_ERROR_CHECK_ALLOC(tag->tagger);
 
-		if (git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n') < 0)
-			return -1;
+		if ((error = git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n')) < 0)
+			return error;
 	}
 
 	tag->message = NULL;
@@ -176,7 +176,7 @@ int git_tag__parse(void *_tag, git_odb_object *odb_obj)
 
 static int retrieve_tag_reference(
 	git_reference **tag_reference_out,
-	git_buf *ref_name_out,
+	git_str *ref_name_out,
 	git_repository *repo,
 	const char *tag_name)
 {
@@ -185,7 +185,7 @@ static int retrieve_tag_reference(
 
 	*tag_reference_out = NULL;
 
-	if (git_buf_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
+	if (git_str_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
 		return -1;
 
 	error = git_reference_lookup(&tag_ref, repo, ref_name_out->ptr);
@@ -199,11 +199,11 @@ static int retrieve_tag_reference(
 
 static int retrieve_tag_reference_oid(
 	git_oid *oid,
-	git_buf *ref_name_out,
+	git_str *ref_name_out,
 	git_repository *repo,
 	const char *tag_name)
 {
-	if (git_buf_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
+	if (git_str_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0)
 		return -1;
 
 	return git_reference_name_to_id(oid, repo, ref_name_out->ptr);
@@ -217,16 +217,16 @@ static int write_tag_annotation(
 		const git_signature *tagger,
 		const char *message)
 {
-	git_buf tag = GIT_BUF_INIT;
+	git_str tag = GIT_STR_INIT;
 	git_odb *odb;
 
 	git_oid__writebuf(&tag, "object ", git_object_id(target));
-	git_buf_printf(&tag, "type %s\n", git_object_type2string(git_object_type(target)));
-	git_buf_printf(&tag, "tag %s\n", tag_name);
+	git_str_printf(&tag, "type %s\n", git_object_type2string(git_object_type(target)));
+	git_str_printf(&tag, "tag %s\n", tag_name);
 	git_signature__writebuf(&tag, "tagger ", tagger);
-	git_buf_putc(&tag, '\n');
+	git_str_putc(&tag, '\n');
 
-	if (git_buf_puts(&tag, message) < 0)
+	if (git_str_puts(&tag, message) < 0)
 		goto on_error;
 
 	if (git_repository_odb__weakptr(&odb, repo) < 0)
@@ -235,11 +235,11 @@ static int write_tag_annotation(
 	if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJECT_TAG) < 0)
 		goto on_error;
 
-	git_buf_dispose(&tag);
+	git_str_dispose(&tag);
 	return 0;
 
 on_error:
-	git_buf_dispose(&tag);
+	git_str_dispose(&tag);
 	git_error_set(GIT_ERROR_OBJECT, "failed to create tag annotation");
 	return -1;
 }
@@ -255,7 +255,7 @@ static int git_tag_create__internal(
 		int create_tag_annotation)
 {
 	git_reference *new_ref = NULL;
-	git_buf ref_name = GIT_BUF_INIT;
+	git_str ref_name = GIT_STR_INIT;
 
 	int error;
 
@@ -276,7 +276,7 @@ static int git_tag_create__internal(
 	/** Ensure the tag name doesn't conflict with an already existing
 	 *	reference unless overwriting has explicitly been requested **/
 	if (error == 0 && !allow_ref_overwrite) {
-		git_buf_dispose(&ref_name);
+		git_str_dispose(&ref_name);
 		git_error_set(GIT_ERROR_TAG, "tag already exists");
 		return GIT_EEXISTS;
 	}
@@ -291,7 +291,7 @@ static int git_tag_create__internal(
 
 cleanup:
 	git_reference_free(new_ref);
-	git_buf_dispose(&ref_name);
+	git_str_dispose(&ref_name);
 	return error;
 }
 
@@ -344,7 +344,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 	git_odb_object *target_obj;
 
 	git_reference *new_ref = NULL;
-	git_buf ref_name = GIT_BUF_INIT;
+	git_str ref_name = GIT_STR_INIT;
 
 	GIT_ASSERT_ARG(oid);
 	GIT_ASSERT_ARG(buffer);
@@ -395,7 +395,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 	git_odb_stream_free(stream);
 
 	if (error < 0) {
-		git_buf_dispose(&ref_name);
+		git_str_dispose(&ref_name);
 		return error;
 	}
 
@@ -403,7 +403,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 		&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite, NULL);
 
 	git_reference_free(new_ref);
-	git_buf_dispose(&ref_name);
+	git_str_dispose(&ref_name);
 
 	return error;
 
@@ -418,12 +418,12 @@ on_error:
 int git_tag_delete(git_repository *repo, const char *tag_name)
 {
 	git_reference *tag_ref;
-	git_buf ref_name = GIT_BUF_INIT;
+	git_str ref_name = GIT_STR_INIT;
 	int error;
 
 	error = retrieve_tag_reference(&tag_ref, &ref_name, repo, tag_name);
 
-	git_buf_dispose(&ref_name);
+	git_str_dispose(&ref_name);
 
 	if (error < 0)
 		return error;
@@ -535,11 +535,13 @@ int git_tag_peel(git_object **tag_target, const git_tag *tag)
 
 int git_tag_name_is_valid(int *valid, const char *name)
 {
-	git_buf ref_name = GIT_BUF_INIT;
+	git_str ref_name = GIT_STR_INIT;
 	int error = 0;
 
 	GIT_ASSERT(valid);
 
+	*valid = 0;
+
 	/*
 	 * Discourage tag name starting with dash,
 	 * https://github.com/git/git/commit/4f0accd638b8d2
@@ -547,14 +549,14 @@ int git_tag_name_is_valid(int *valid, const char *name)
 	if (!name || name[0] == '-')
 		goto done;
 
-	if ((error = git_buf_puts(&ref_name, GIT_REFS_TAGS_DIR)) < 0 ||
-	    (error = git_buf_puts(&ref_name, name)) < 0)
+	if ((error = git_str_puts(&ref_name, GIT_REFS_TAGS_DIR)) < 0 ||
+	    (error = git_str_puts(&ref_name, name)) < 0)
 		goto done;
 
 	error = git_reference_name_is_valid(valid, ref_name.ptr);
 
 done:
-	git_buf_dispose(&ref_name);
+	git_str_dispose(&ref_name);
 	return error;
 }
 

data/vendor/libgit2/src/thread.h

@@ -12,7 +12,7 @@
 #if defined(__clang__)
 
 # if (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 1))
-#  error Atomic primitives do not exist on this version of clang; configure libgit2 with -DTHREADSAFE=OFF
+#  error Atomic primitives do not exist on this version of clang; configure libgit2 with -DUSE_THREADS=OFF
 # else
 #  define GIT_BUILTIN_ATOMIC
 # endif
@@ -20,7 +20,7 @@
 #elif defined(__GNUC__)
 
 # if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1))
-#  error Atomic primitives do not exist on this version of gcc; configure libgit2 with -DTHREADSAFE=OFF
+#  error Atomic primitives do not exist on this version of gcc; configure libgit2 with -DUSE_THREADS=OFF
 # elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
 #  define GIT_BUILTIN_ATOMIC
 # else
@@ -180,7 +180,7 @@ GIT_INLINE(volatile void *) git_atomic__swap(
 #if defined(GIT_WIN32)
 	return InterlockedExchangePointer(ptr, newval);
 #elif defined(GIT_BUILTIN_ATOMIC)
-	void * volatile foundval = NULL;
+	void * foundval = NULL;
 	__atomic_exchange(ptr, &newval, &foundval, __ATOMIC_SEQ_CST);
 	return foundval;
 #elif defined(GIT_BUILTIN_SYNC)

data/vendor/libgit2/src/threadstate.c

@@ -36,8 +36,8 @@ static void threadstate_dispose(git_threadstate *threadstate)
 	if (!threadstate)
 		return;
 
-    if (threadstate->error_t.message != git_buf__initbuf)
-        git__free(threadstate->error_t.message);
+	if (threadstate->error_t.message != git_str__initstr)
+		git__free(threadstate->error_t.message);
 	threadstate->error_t.message = NULL;
 }
 
@@ -76,7 +76,7 @@ git_threadstate *git_threadstate_get(void)
 		return threadstate;
 
 	if ((threadstate = git__calloc(1, sizeof(git_threadstate))) == NULL ||
-	    git_buf_init(&threadstate->error_buf, 0) < 0)
+	    git_str_init(&threadstate->error_buf, 0) < 0)
 		return NULL;
 
 	git_tlsdata_set(tls_key, threadstate);

data/vendor/libgit2/src/threadstate.h

@@ -12,7 +12,7 @@
 typedef struct {
 	git_error *last_error;
 	git_error error_t;
-	git_buf error_buf;
+	git_str error_buf;
 	char oid_fmt[GIT_OID_HEXSZ+1];
 } git_threadstate;