rugged 1.3.1 → 1.9.0

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

@@ -7,12 +7,16 @@
 
 #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"
+#include "git2/sys/email.h"
 #include "git2/version.h"
 
 /*
@@ -32,7 +36,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 +44,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 +62,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_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 git_buf_oom(out) ? -1 : 0;
+	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 +105,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 +131,24 @@ 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_MAX_HEXSIZE + 1];
 	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 ||
+	git_oid_tostr(id, GIT_OID_MAX_HEXSIZE + 1, commit_id);
+
+	if ((error = git_str_printf(out, "From %s %s\n", 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 +158,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 +176,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 +194,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 +206,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 +232,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 +253,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/{transports/ssh.h → libgit2/experimental.h.in}

@@ -4,11 +4,10 @@
  * 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_transports_ssh_h__
-#define INCLUDE_transports_ssh_h__
 
-#include "common.h"
+#ifndef INCLUDE_experimental_h__
+#define INCLUDE_experimental_h__
 
-int git_transport_ssh_global_init(void);
+#cmakedefine GIT_EXPERIMENTAL_SHA256 1
 
 #endif

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

@@ -11,15 +11,17 @@
 #include "git2/refs.h"
 #include "git2/revwalk.h"
 #include "git2/transport.h"
+#include "git2/sys/remote.h"
 
+#include "oid.h"
 #include "remote.h"
 #include "refspec.h"
 #include "pack.h"
-#include "netops.h"
 #include "repository.h"
 #include "refs.h"
+#include "transports/smart.h"
 
-static int maybe_want(git_remote *remote, git_remote_head *head, git_odb *odb, git_refspec *tagspec, git_remote_autotag_option_t tagopt)
+static int maybe_want(git_remote *remote, git_remote_head *head, git_refspec *tagspec, git_remote_autotag_option_t tagopt)
 {
 	int match = 0, valid;
 
@@ -44,23 +46,63 @@ static int maybe_want(git_remote *remote, git_remote_head *head, git_odb *odb, g
 	if (!match)
 		return 0;
 
-	/* If we have the object, mark it so we don't ask for it */
-	if (git_odb_exists(odb, &head->oid)) {
-		head->local = 1;
+	return git_vector_insert(&remote->refs, head);
+}
+
+static int mark_local(git_remote *remote)
+{
+	git_remote_head *head;
+	git_odb *odb;
+	size_t i;
+
+	if (git_repository_odb__weakptr(&odb, remote->repo) < 0)
+		return -1;
+
+	git_vector_foreach(&remote->refs, i, head) {
+		/* If we have the object, mark it so we don't ask for it.
+		   However if we are unshallowing or changing history
+		   depth, we need to ask for it even though the head
+		   exists locally. */
+		if (remote->nego.depth == GIT_FETCH_DEPTH_FULL &&
+		    git_odb_exists(odb, &head->oid))
+			head->local = 1;
+		else
+			remote->need_pack = 1;
 	}
-	else
-		remote->need_pack = 1;
 
-	return git_vector_insert(&remote->refs, head);
+	return 0;
+}
+
+static int maybe_want_oid(git_remote *remote, git_refspec *spec)
+{
+	git_remote_head *oid_head;
+
+	oid_head = git__calloc(1, sizeof(git_remote_head));
+	GIT_ERROR_CHECK_ALLOC(oid_head);
+
+	git_oid__fromstr(&oid_head->oid, spec->src, remote->repo->oid_type);
+
+	if (spec->dst) {
+		oid_head->name = git__strdup(spec->dst);
+		GIT_ERROR_CHECK_ALLOC(oid_head->name);
+	}
+
+	if (git_vector_insert(&remote->local_heads, oid_head) < 0 ||
+	    git_vector_insert(&remote->refs, oid_head) < 0)
+		return -1;
+
+	return 0;
 }
 
 static int filter_wants(git_remote *remote, const git_fetch_options *opts)
 {
 	git_remote_head **heads;
-	git_refspec tagspec, head;
+	git_refspec tagspec, head, *spec;
 	int error = 0;
-	git_odb *odb;
 	size_t i, heads_len;
+	unsigned int remote_caps;
+	unsigned int oid_mask = GIT_REMOTE_CAPABILITY_TIP_OID |
+	                        GIT_REMOTE_CAPABILITY_REACHABLE_OID;
 	git_remote_autotag_option_t tagopt = remote->download_tags;
 
 	if (opts && opts->download_tags != GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED)
@@ -87,17 +129,33 @@ static int filter_wants(git_remote *remote, const git_fetch_options *opts)
 			goto cleanup;
 	}
 
-	if (git_repository_odb__weakptr(&odb, remote->repo) < 0)
-		goto cleanup;
-
-	if (git_remote_ls((const git_remote_head ***)&heads, &heads_len, remote) < 0)
+	if ((error = git_remote_ls((const git_remote_head ***)&heads, &heads_len, remote)) < 0 ||
+	    (error = git_remote_capabilities(&remote_caps, remote)) < 0)
 		goto cleanup;
 
+	/* Handle remote heads */
 	for (i = 0; i < heads_len; i++) {
-		if ((error = maybe_want(remote, heads[i], odb, &tagspec, tagopt)) < 0)
-			break;
+		if ((error = maybe_want(remote, heads[i], &tagspec, tagopt)) < 0)
+			goto cleanup;
+	}
+
+	/* Handle explicitly specified OID specs */
+	git_vector_foreach(&remote->active_refspecs, i, spec) {
+		if (!git_oid__is_hexstr(spec->src, remote->repo->oid_type))
+			continue;
+
+		if (!(remote_caps & oid_mask)) {
+			git_error_set(GIT_ERROR_INVALID, "cannot fetch a specific object from the remote repository");
+			error = -1;
+			goto cleanup;
+		}
+
+		if ((error = maybe_want_oid(remote, spec)) < 0)
+			goto cleanup;
 	}
 
+	error = mark_local(remote);
+
 cleanup:
 	git_refspec__dispose(&tagspec);
 
@@ -112,14 +170,18 @@ cleanup:
 int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts)
 {
 	git_transport *t = remote->transport;
+	int error;
 
 	remote->need_pack = 0;
 
-	if (filter_wants(remote, opts) < 0) {
-		git_error_set(GIT_ERROR_NET, "failed to filter the reference list for wants");
-		return -1;
+	if (opts) {
+		GIT_ASSERT_ARG(opts->depth >= 0);
+		remote->nego.depth = opts->depth;
 	}
 
+	if (filter_wants(remote, opts) < 0)
+		return -1;
+
 	/* Don't try to negotiate when we don't want anything */
 	if (!remote->need_pack)
 		return 0;
@@ -128,27 +190,40 @@ int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts)
 	 * Now we have everything set up so we can start tell the
 	 * server what we want and what we have.
 	 */
-	return t->negotiate_fetch(t,
+	remote->nego.refs = (const git_remote_head * const *)remote->refs.contents;
+	remote->nego.refs_len = remote->refs.length;
+
+	if (git_repository__shallow_roots(&remote->nego.shallow_roots,
+	                                  &remote->nego.shallow_roots_len,
+	                                  remote->repo) < 0)
+		return -1;
+
+	error = t->negotiate_fetch(t,
 		remote->repo,
-		(const git_remote_head * const *)remote->refs.contents,
-		remote->refs.length);
+		&remote->nego);
+
+	git__free(remote->nego.shallow_roots);
+
+	return error;
 }
 
-int git_fetch_download_pack(git_remote *remote, const git_remote_callbacks *callbacks)
+int git_fetch_download_pack(git_remote *remote)
 {
+	git_oidarray shallow_roots = { NULL };
 	git_transport *t = remote->transport;
-	git_indexer_progress_cb progress = NULL;
-	void *payload = NULL;
+	int error;
 
 	if (!remote->need_pack)
 		return 0;
 
-	if (callbacks) {
-		progress = callbacks->transfer_progress;
-		payload  = callbacks->payload;
-	}
+	if ((error = t->download_pack(t, remote->repo, &remote->stats)) != 0 ||
+	    (error = t->shallow_roots(&shallow_roots, t)) != 0)
+		return error;
 
-	return t->download_pack(t, remote->repo, &remote->stats, progress, payload);
+	error = git_repository__shallow_roots_write(remote->repo, &shallow_roots);
+
+	git_oidarray_dispose(&shallow_roots);
+	return error;
 }
 
 int git_fetch_options_init(git_fetch_options *opts, unsigned int version)

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

@@ -11,11 +11,9 @@
 
 #include "git2/remote.h"
 
-#include "netops.h"
-
 int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts);
 
-int git_fetch_download_pack(git_remote *remote, const git_remote_callbacks *callbacks);
+int git_fetch_download_pack(git_remote *remote);
 
 int git_fetch_setup_walk(git_revwalk **out, git_repository *repo);
 

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

@@ -10,7 +10,7 @@
 #include "git2/types.h"
 #include "git2/oid.h"
 
-#include "buffer.h"
+#include "str.h"
 #include "futils.h"
 #include "filebuf.h"
 #include "refs.h"
@@ -44,7 +44,7 @@ static char *sanitized_remote_url(const char *remote_url)
 	int error;
 
 	if (git_net_url_parse(&url, remote_url) == 0) {
-		git_buf buf = GIT_BUF_INIT;
+		git_str buf = GIT_STR_INIT;
 
 		git__free(url.username);
 		git__free(url.password);
@@ -53,7 +53,7 @@ static char *sanitized_remote_url(const char *remote_url)
 		if ((error = git_net_url_fmt(&buf, &url)) < 0)
 			goto fallback;
 
-		sanitized = git_buf_detach(&buf);
+		sanitized = git_str_detach(&buf);
 	}
 
 fallback:
@@ -105,15 +105,14 @@ static int fetchhead_ref_write(
 	git_filebuf *file,
 	git_fetchhead_ref *fetchhead_ref)
 {
-	char oid[GIT_OID_HEXSZ + 1];
+	char oid[GIT_OID_MAX_HEXSIZE + 1];
 	const char *type, *name;
 	int head = 0;
 
 	GIT_ASSERT_ARG(file);
 	GIT_ASSERT_ARG(fetchhead_ref);
 
-	git_oid_fmt(oid, &fetchhead_ref->oid);
-	oid[GIT_OID_HEXSZ] = '\0';
+	git_oid_tostr(oid, GIT_OID_MAX_HEXSIZE + 1, &fetchhead_ref->oid);
 
 	if (git__prefixcmp(fetchhead_ref->ref_name, GIT_REFS_HEADS_DIR) == 0) {
 		type = "branch ";
@@ -143,22 +142,22 @@ static int fetchhead_ref_write(
 int git_fetchhead_write(git_repository *repo, git_vector *fetchhead_refs)
 {
 	git_filebuf file = GIT_FILEBUF_INIT;
-	git_buf path = GIT_BUF_INIT;
+	git_str path = GIT_STR_INIT;
 	unsigned int i;
 	git_fetchhead_ref *fetchhead_ref;
 
 	GIT_ASSERT_ARG(repo);
 	GIT_ASSERT_ARG(fetchhead_refs);
 
-	if (git_buf_joinpath(&path, repo->gitdir, GIT_FETCH_HEAD_FILE) < 0)
+	if (git_str_joinpath(&path, repo->gitdir, GIT_FETCH_HEAD_FILE) < 0)
 		return -1;
 
 	if (git_filebuf_open(&file, path.ptr, GIT_FILEBUF_APPEND, GIT_REFS_FILE_MODE) < 0) {
-		git_buf_dispose(&path);
+		git_str_dispose(&path);
 		return -1;
 	}
 
-	git_buf_dispose(&path);
+	git_str_dispose(&path);
 
 	git_vector_sort(fetchhead_refs);
 
@@ -171,10 +170,11 @@ int git_fetchhead_write(git_repository *repo, git_vector *fetchhead_refs)
 static int fetchhead_ref_parse(
 	git_oid *oid,
 	unsigned int *is_merge,
-	git_buf *ref_name,
+	git_str *ref_name,
 	const char **remote_url,
 	char *line,
-	size_t line_num)
+	size_t line_num,
+	git_oid_t oid_type)
 {
 	char *oid_str, *is_merge_str, *desc, *name = NULL;
 	const char *type = NULL;
@@ -196,13 +196,13 @@ static int fetchhead_ref_parse(
 		*is_merge = 1;
 	}
 
-	if (strlen(oid_str) != GIT_OID_HEXSZ) {
+	if (strlen(oid_str) != git_oid_hexsize(oid_type)) {
 		git_error_set(GIT_ERROR_FETCHHEAD,
 			"invalid object ID in FETCH_HEAD line %"PRIuZ, line_num);
 		return -1;
 	}
 
-	if (git_oid_fromstr(oid, oid_str) < 0) {
+	if (git_oid__fromstr(oid, oid_str, oid_type) < 0) {
 		const git_error *oid_err = git_error_last();
 		const char *err_msg = oid_err ? oid_err->message : "invalid object ID";
 
@@ -259,21 +259,22 @@ static int fetchhead_ref_parse(
 		*remote_url = desc;
 	}
 
-	git_buf_clear(ref_name);
+	git_str_clear(ref_name);
 
 	if (type)
-		git_buf_join(ref_name, '/', type, name);
+		git_str_join(ref_name, '/', type, name);
 	else if(name)
-		git_buf_puts(ref_name, name);
+		git_str_puts(ref_name, name);
 
 	return error;
 }
 
-int git_repository_fetchhead_foreach(git_repository *repo,
+int git_repository_fetchhead_foreach(
+	git_repository *repo,
 	git_repository_fetchhead_foreach_cb cb,
 	void *payload)
 {
-	git_buf path = GIT_BUF_INIT, file = GIT_BUF_INIT, name = GIT_BUF_INIT;
+	git_str path = GIT_STR_INIT, file = GIT_STR_INIT, name = GIT_STR_INIT;
 	const char *ref_name;
 	git_oid oid;
 	const char *remote_url;
@@ -285,10 +286,10 @@ int git_repository_fetchhead_foreach(git_repository *repo,
 	GIT_ASSERT_ARG(repo);
 	GIT_ASSERT_ARG(cb);
 
-	if (git_buf_joinpath(&path, repo->gitdir, GIT_FETCH_HEAD_FILE) < 0)
+	if (git_str_joinpath(&path, repo->gitdir, GIT_FETCH_HEAD_FILE) < 0)
 		return -1;
 
-	if ((error = git_futils_readbuffer(&file, git_buf_cstr(&path))) < 0)
+	if ((error = git_futils_readbuffer(&file, git_str_cstr(&path))) < 0)
 		goto done;
 
 	buffer = file.ptr;
@@ -296,12 +297,13 @@ int git_repository_fetchhead_foreach(git_repository *repo,
 	while ((line = git__strsep(&buffer, "\n")) != NULL) {
 		++line_num;
 
-		if ((error = fetchhead_ref_parse(
-				&oid, &is_merge, &name, &remote_url, line, line_num)) < 0)
+		if ((error = fetchhead_ref_parse(&oid, &is_merge, &name,
+				&remote_url, line, line_num,
+				repo->oid_type)) < 0)
 			goto done;
 
-		if (git_buf_len(&name) > 0)
-			ref_name = git_buf_cstr(&name);
+		if (git_str_len(&name) > 0)
+			ref_name = git_str_cstr(&name);
 		else
 			ref_name = NULL;
 
@@ -319,9 +321,9 @@ int git_repository_fetchhead_foreach(git_repository *repo,
 	}
 
 done:
-	git_buf_dispose(&file);
-	git_buf_dispose(&path);
-	git_buf_dispose(&name);
+	git_str_dispose(&file);
+	git_str_dispose(&path);
+	git_str_dispose(&name);
 
 	return error;
 }