rugged 1.3.2 → 1.6.2

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

@@ -71,7 +71,11 @@ int git_reflog_write(git_reflog *reflog)
 	return db->backend->reflog_write(db->backend, reflog);
 }
 
-int git_reflog_append(git_reflog *reflog, const git_oid *new_oid, const git_signature *committer, const char *msg)
+int git_reflog_append(
+	git_reflog *reflog,
+	const git_oid *new_oid,
+	const git_signature *committer,
+	const char *msg)
 {
 	const git_reflog_entry *previous;
 	git_reflog_entry *entry;
@@ -104,7 +108,7 @@ int git_reflog_append(git_reflog *reflog, const git_oid *new_oid, const git_sign
 	previous = git_reflog_entry_byindex(reflog, 0);
 
 	if (previous == NULL)
-		git_oid_fromstr(&entry->oid_old, GIT_OID_HEX_ZERO);
+		git_oid_clear(&entry->oid_old, reflog->oid_type);
 	else
 		git_oid_cpy(&entry->oid_old, &previous->oid_cur);
 
@@ -219,9 +223,7 @@ int git_reflog_drop(git_reflog *reflog, size_t idx, int rewrite_previous_entry)
 	/* If the oldest entry has just been removed... */
 	if (idx == entrycount - 1) {
 		/* ...clear the oid_old member of the "new" oldest entry */
-		if (git_oid_fromstr(&entry->oid_old, GIT_OID_HEX_ZERO) < 0)
-			return -1;
-
+		git_oid_clear(&entry->oid_old, reflog->oid_type);
 		return 0;
 	}
 

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

@@ -16,8 +16,6 @@
 #define GIT_REFLOG_DIR_MODE 0777
 #define GIT_REFLOG_FILE_MODE 0666
 
-#define GIT_REFLOG_SIZE_MIN (2*GIT_OID_HEXSZ+2+17)
-
 struct git_reflog_entry {
 	git_oid oid_old;
 	git_oid oid_cur;
@@ -30,6 +28,7 @@ struct git_reflog_entry {
 struct git_reflog {
 	git_refdb *db;
 	char *ref_name;
+	git_oid_t oid_type;
 	git_vector entries;
 };
 

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

@@ -86,6 +86,8 @@ git_reference *git_reference__alloc(
 
 	if (peel != NULL)
 		git_oid_cpy(&ref->peel, peel);
+	else
+		git_oid_clear(&ref->peel, GIT_OID_SHA1);
 
 	return ref;
 }
@@ -247,7 +249,7 @@ int git_reference_dwim(git_reference **out, git_repository *repo, const char *re
 	int error = 0, i, valid;
 	bool fallbackmode = true, foundvalid = false;
 	git_reference *ref;
-	git_buf refnamebuf = GIT_BUF_INIT, name = GIT_BUF_INIT;
+	git_str refnamebuf = GIT_STR_INIT, name = GIT_STR_INIT;
 
 	static const char *formatters[] = {
 		"%s",
@@ -260,18 +262,18 @@ int git_reference_dwim(git_reference **out, git_repository *repo, const char *re
 	};
 
 	if (*refname)
-		git_buf_puts(&name, refname);
+		git_str_puts(&name, refname);
 	else {
-		git_buf_puts(&name, GIT_HEAD_FILE);
+		git_str_puts(&name, GIT_HEAD_FILE);
 		fallbackmode = false;
 	}
 
 	for (i = 0; formatters[i] && (fallbackmode || i == 0); i++) {
 
-		git_buf_clear(&refnamebuf);
+		git_str_clear(&refnamebuf);
 
-		if ((error = git_buf_printf(&refnamebuf, formatters[i], git_buf_cstr(&name))) < 0 ||
-		    (error = git_reference_name_is_valid(&valid, git_buf_cstr(&refnamebuf))) < 0)
+		if ((error = git_str_printf(&refnamebuf, formatters[i], git_str_cstr(&name))) < 0 ||
+		    (error = git_reference_name_is_valid(&valid, git_str_cstr(&refnamebuf))) < 0)
 			goto cleanup;
 
 		if (!valid) {
@@ -280,7 +282,7 @@ int git_reference_dwim(git_reference **out, git_repository *repo, const char *re
 		}
 		foundvalid = true;
 
-		error = git_reference_lookup_resolved(&ref, repo, git_buf_cstr(&refnamebuf), -1);
+		error = git_reference_lookup_resolved(&ref, repo, git_str_cstr(&refnamebuf), -1);
 
 		if (!error) {
 			*out = ref;
@@ -296,14 +298,14 @@ cleanup:
 	if (error && !foundvalid) {
 		/* never found a valid reference name */
 		git_error_set(GIT_ERROR_REFERENCE,
-			"could not use '%s' as valid reference name", git_buf_cstr(&name));
+			"could not use '%s' as valid reference name", git_str_cstr(&name));
 	}
 
 	if (error == GIT_ENOTFOUND)
 		git_error_set(GIT_ERROR_REFERENCE, "no reference found for shorthand '%s'", refname);
 
-	git_buf_dispose(&name);
-	git_buf_dispose(&refnamebuf);
+	git_str_dispose(&name);
+	git_str_dispose(&refnamebuf);
 	return error;
 }
 
@@ -891,7 +893,7 @@ static bool is_all_caps_and_underscore(const char *name, size_t len)
 
 /* Inspired from https://github.com/git/git/blob/f06d47e7e0d9db709ee204ed13a8a7486149f494/refs.c#L36-100 */
 int git_reference__normalize_name(
-	git_buf *buf,
+	git_str *buf,
 	const char *name,
 	unsigned int flags)
 {
@@ -902,7 +904,7 @@ int git_reference__normalize_name(
 	bool validate = (flags & GIT_REFERENCE_FORMAT__VALIDATION_DISABLE) == 0;
 
 #ifdef GIT_USE_ICONV
-	git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
+	git_fs_path_iconv_t ic = GIT_PATH_ICONV_INIT;
 #endif
 
 	GIT_ASSERT_ARG(name);
@@ -914,22 +916,22 @@ int git_reference__normalize_name(
 		goto cleanup;
 
 	if (normalize)
-		git_buf_clear(buf);
+		git_str_clear(buf);
 
 #ifdef GIT_USE_ICONV
 	if ((flags & GIT_REFERENCE_FORMAT__PRECOMPOSE_UNICODE) != 0) {
 		size_t namelen = strlen(current);
-		if ((error = git_path_iconv_init_precompose(&ic)) < 0 ||
-			(error = git_path_iconv(&ic, &current, &namelen)) < 0)
+		if ((error = git_fs_path_iconv_init_precompose(&ic)) < 0 ||
+			(error = git_fs_path_iconv(&ic, &current, &namelen)) < 0)
 			goto cleanup;
 		error = GIT_EINVALIDSPEC;
 	}
 #endif
 
 	if (!validate) {
-		git_buf_sets(buf, current);
+		git_str_sets(buf, current);
 
-		error = git_buf_oom(buf) ? -1 : 0;
+		error = git_str_oom(buf) ? -1 : 0;
 		goto cleanup;
 	}
 
@@ -949,13 +951,13 @@ int git_reference__normalize_name(
 				process_flags &= ~GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
 
 			if (normalize) {
-				size_t cur_len = git_buf_len(buf);
+				size_t cur_len = git_str_len(buf);
 
-				git_buf_joinpath(buf, git_buf_cstr(buf), current);
-				git_buf_truncate(buf,
+				git_str_joinpath(buf, git_str_cstr(buf), current);
+				git_str_truncate(buf,
 					cur_len + segment_len + (segments_count ? 1 : 0));
 
-				if (git_buf_oom(buf)) {
+				if (git_str_oom(buf)) {
 					error = -1;
 					goto cleanup;
 				}
@@ -1008,10 +1010,10 @@ cleanup:
 			"the given reference name '%s' is not valid", name);
 
 	if (error && normalize)
-		git_buf_dispose(buf);
+		git_str_dispose(buf);
 
 #ifdef GIT_USE_ICONV
-	git_path_iconv_clear(&ic);
+	git_fs_path_iconv_clear(&ic);
 #endif
 
 	return error;
@@ -1023,13 +1025,13 @@ int git_reference_normalize_name(
 	const char *name,
 	unsigned int flags)
 {
-	git_buf buf = GIT_BUF_INIT;
+	git_str buf = GIT_STR_INIT;
 	int error;
 
 	if ((error = git_reference__normalize_name(&buf, name, flags)) < 0)
 		goto cleanup;
 
-	if (git_buf_len(&buf) > buffer_size - 1) {
+	if (git_str_len(&buf) > buffer_size - 1) {
 		git_error_set(
 		GIT_ERROR_REFERENCE,
 		"the provided buffer is too short to hold the normalization of '%s'", name);
@@ -1037,13 +1039,13 @@ int git_reference_normalize_name(
 		goto cleanup;
 	}
 
-	if ((error = git_buf_copy_cstr(buffer_out, buffer_size, &buf)) < 0)
+	if ((error = git_str_copy_cstr(buffer_out, buffer_size, &buf)) < 0)
 		goto cleanup;
 
 	error = 0;
 
 cleanup:
-	git_buf_dispose(&buf);
+	git_str_dispose(&buf);
 	return error;
 }
 
@@ -1143,12 +1145,12 @@ int git_reference__update_for_commit(
 {
 	git_reference *ref_new = NULL;
 	git_commit *commit = NULL;
-	git_buf reflog_msg = GIT_BUF_INIT;
+	git_str reflog_msg = GIT_STR_INIT;
 	const git_signature *who;
 	int error;
 
 	if ((error = git_commit_lookup(&commit, repo, id)) < 0 ||
-		(error = git_buf_printf(&reflog_msg, "%s%s: %s",
+		(error = git_str_printf(&reflog_msg, "%s%s: %s",
 			operation ? operation : "commit",
 			commit_type(commit),
 			git_commit_summary(commit))) < 0)
@@ -1161,15 +1163,15 @@ int git_reference__update_for_commit(
 			return error;
 
 		error = reference__create(&ref_new, repo, ref->name, id, NULL, 1, who,
-					  git_buf_cstr(&reflog_msg), &ref->target.oid, NULL);
+					  git_str_cstr(&reflog_msg), &ref->target.oid, NULL);
 	}
 	else
 		error = git_reference__update_terminal(
-			repo, ref_name, id, who, git_buf_cstr(&reflog_msg));
+			repo, ref_name, id, who, git_str_cstr(&reflog_msg));
 
 done:
 	git_reference_free(ref_new);
-	git_buf_dispose(&reflog_msg);
+	git_str_dispose(&reflog_msg);
 	git_commit_free(commit);
 	return error;
 }

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

@@ -13,7 +13,7 @@
 #include "git2/refs.h"
 #include "git2/refdb.h"
 #include "strmap.h"
-#include "buffer.h"
+#include "str.h"
 #include "oid.h"
 
 extern bool git_reference__enable_symbolic_ref_target_validation;
@@ -83,7 +83,7 @@ struct git_reference {
  */
 git_reference *git_reference__realloc(git_reference **ptr_to_ref, const char *name);
 
-int git_reference__normalize_name(git_buf *buf, const char *name, unsigned int flags);
+int git_reference__normalize_name(git_str *buf, const char *name, unsigned int flags);
 int git_reference__update_terminal(git_repository *repo, const char *ref_name, const git_oid *oid, const git_signature *sig, const char *log_message);
 int git_reference__name_is_valid(int *valid, const char *name, unsigned int flags);
 int git_reference__is_branch(const char *ref_name);

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

@@ -7,8 +7,7 @@
 
 #include "refspec.h"
 
-#include "git2/errors.h"
-
+#include "buf.h"
 #include "refs.h"
 #include "util.h"
 #include "vector.h"
@@ -243,16 +242,12 @@ int git_refspec_dst_matches(const git_refspec *refspec, const char *refname)
 }
 
 static int refspec_transform(
-	git_buf *out, const char *from, const char *to, const char *name)
+	git_str *out, const char *from, const char *to, const char *name)
 {
 	const char *from_star, *to_star;
 	size_t replacement_len, star_offset;
-	int error;
-
-	if ((error = git_buf_sanitize(out)) < 0)
-		return error;
 
-	git_buf_clear(out);
+	git_str_clear(out);
 
 	/*
 	 * There are two parts to each side of a refspec, the bit
@@ -269,72 +264,72 @@ static int refspec_transform(
 	star_offset = from_star - from;
 
 	/* the first half is copied over */
-	git_buf_put(out, to, to_star - to);
+	git_str_put(out, to, to_star - to);
 
 	/*
 	 * Copy over the name, but exclude the trailing part in "from" starting
 	 * after the glob
 	 */
 	replacement_len = strlen(name + star_offset) - strlen(from_star + 1);
-	git_buf_put(out, name + star_offset, replacement_len);
+	git_str_put(out, name + star_offset, replacement_len);
 
-	return git_buf_puts(out, to_star + 1);
+	return git_str_puts(out, to_star + 1);
 }
 
 int git_refspec_transform(git_buf *out, const git_refspec *spec, const char *name)
 {
-	int error;
+	GIT_BUF_WRAP_PRIVATE(out, git_refspec__transform, spec, name);
+}
 
+int git_refspec__transform(git_str *out, const git_refspec *spec, const char *name)
+{
 	GIT_ASSERT_ARG(out);
 	GIT_ASSERT_ARG(spec);
 	GIT_ASSERT_ARG(name);
 
-	if ((error = git_buf_sanitize(out)) < 0)
-		return error;
-
 	if (!git_refspec_src_matches(spec, name)) {
 		git_error_set(GIT_ERROR_INVALID, "ref '%s' doesn't match the source", name);
 		return -1;
 	}
 
 	if (!spec->pattern)
-		return git_buf_puts(out, spec->dst ? spec->dst : "");
+		return git_str_puts(out, spec->dst ? spec->dst : "");
 
 	return refspec_transform(out, spec->src, spec->dst, name);
 }
 
 int git_refspec_rtransform(git_buf *out, const git_refspec *spec, const char *name)
 {
-	int error;
+	GIT_BUF_WRAP_PRIVATE(out, git_refspec__rtransform, spec, name);
+}
 
+int git_refspec__rtransform(git_str *out, const git_refspec *spec, const char *name)
+{
 	GIT_ASSERT_ARG(out);
 	GIT_ASSERT_ARG(spec);
 	GIT_ASSERT_ARG(name);
 
-	if ((error = git_buf_sanitize(out)) < 0)
-		return error;
-
 	if (!git_refspec_dst_matches(spec, name)) {
 		git_error_set(GIT_ERROR_INVALID, "ref '%s' doesn't match the destination", name);
 		return -1;
 	}
 
 	if (!spec->pattern)
-		return git_buf_puts(out, spec->src);
+		return git_str_puts(out, spec->src);
 
 	return refspec_transform(out, spec->dst, spec->src, name);
 }
 
-int git_refspec__serialize(git_buf *out, const git_refspec *refspec)
+int git_refspec__serialize(git_str *out, const git_refspec *refspec)
 {
 	if (refspec->force)
-		git_buf_putc(out, '+');
+		git_str_putc(out, '+');
 
-	git_buf_printf(out, "%s:%s",
+	git_str_printf(out, "%s:%s",
 		refspec->src != NULL ? refspec->src : "",
 		refspec->dst != NULL ? refspec->dst : "");
 
-	return git_buf_oom(out) == false;
+	return git_str_oom(out) == false;
 }
 
 int git_refspec_is_wildcard(const git_refspec *spec)
@@ -354,7 +349,7 @@ git_direction git_refspec_direction(const git_refspec *spec)
 
 int git_refspec__dwim_one(git_vector *out, git_refspec *spec, git_vector *refs)
 {
-	git_buf buf = GIT_BUF_INIT;
+	git_str buf = GIT_STR_INIT;
 	size_t j, pos;
 	git_remote_head key;
 	git_refspec *cur;
@@ -382,14 +377,14 @@ int git_refspec__dwim_one(git_vector *out, git_refspec *spec, git_vector *refs)
 	/* shorthand on the lhs */
 	if (git__prefixcmp(spec->src, GIT_REFS_DIR)) {
 		for (j = 0; formatters[j]; j++) {
-			git_buf_clear(&buf);
-			git_buf_printf(&buf, formatters[j], spec->src);
-			GIT_ERROR_CHECK_ALLOC_BUF(&buf);
+			git_str_clear(&buf);
+			git_str_printf(&buf, formatters[j], spec->src);
+			GIT_ERROR_CHECK_ALLOC_STR(&buf);
 
-			key.name = (char *) git_buf_cstr(&buf);
+			key.name = (char *) git_str_cstr(&buf);
 			if (!git_vector_search(&pos, refs, &key)) {
 				/* we found something to match the shorthand, set src to that */
-				cur->src = git_buf_detach(&buf);
+				cur->src = git_str_detach(&buf);
 			}
 		}
 	}
@@ -403,18 +398,18 @@ int git_refspec__dwim_one(git_vector *out, git_refspec *spec, git_vector *refs)
 	if (spec->dst && git__prefixcmp(spec->dst, GIT_REFS_DIR)) {
 		/* if it starts with "remotes" then we just prepend "refs/" */
 		if (!git__prefixcmp(spec->dst, "remotes/")) {
-			git_buf_puts(&buf, GIT_REFS_DIR);
+			git_str_puts(&buf, GIT_REFS_DIR);
 		} else {
-			git_buf_puts(&buf, GIT_REFS_HEADS_DIR);
+			git_str_puts(&buf, GIT_REFS_HEADS_DIR);
 		}
 
-		git_buf_puts(&buf, spec->dst);
-		GIT_ERROR_CHECK_ALLOC_BUF(&buf);
+		git_str_puts(&buf, spec->dst);
+		GIT_ERROR_CHECK_ALLOC_STR(&buf);
 
-		cur->dst = git_buf_detach(&buf);
+		cur->dst = git_str_detach(&buf);
 	}
 
-	git_buf_dispose(&buf);
+	git_str_dispose(&buf);
 
 	if (cur->dst == NULL && spec->dst != NULL) {
 		cur->dst = git__strdup(spec->dst);

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

@@ -10,7 +10,7 @@
 #include "common.h"
 
 #include "git2/refspec.h"
-#include "buffer.h"
+#include "str.h"
 #include "vector.h"
 
 struct git_refspec {
@@ -25,6 +25,9 @@ struct git_refspec {
 
 #define GIT_REFSPEC_TAGS "refs/tags/*:refs/tags/*"
 
+int git_refspec__transform(git_str *out, const git_refspec *spec, const char *name);
+int git_refspec__rtransform(git_str *out, const git_refspec *spec, const char *name);
+
 int git_refspec__parse(
 	struct git_refspec *refspec,
 	const char *str,
@@ -32,7 +35,7 @@ int git_refspec__parse(
 
 void git_refspec__dispose(git_refspec *refspec);
 
-int git_refspec__serialize(git_buf *out, const git_refspec *refspec);
+int git_refspec__serialize(git_str *out, const git_refspec *refspec);
 
 /**
  * Determines if a refspec is a wildcard refspec.