rugged 1.7.2 → 1.9.0

data/vendor/libgit2/src/libgit2/reflog.h

@@ -37,4 +37,6 @@ GIT_INLINE(size_t) reflog_inverse_index(size_t idx, size_t total)
 	return (total - 1) - idx;
 }
 
+void git_reflog_entry__free(git_reflog_entry *entry);
+
 #endif

data/vendor/libgit2/src/libgit2/refs.c

@@ -808,7 +808,7 @@ int git_reference_list(
 
 	if (git_reference_foreach_name(
 			repo, &cb__reflist_add, (void *)&ref_list) < 0) {
-		git_vector_free(&ref_list);
+		git_vector_dispose(&ref_list);
 		return -1;
 	}
 
@@ -835,17 +835,20 @@ static int is_valid_ref_char(char ch)
 	}
 }
 
-static int ensure_segment_validity(const char *name, char may_contain_glob)
+static int ensure_segment_validity(const char *name, char may_contain_glob, bool allow_caret_prefix)
 {
 	const char *current = name;
+	const char *start = current;
 	char prev = '\0';
 	const int lock_len = (int)strlen(GIT_FILELOCK_EXTENSION);
 	int segment_len;
 
 	if (*current == '.')
 		return -1; /* Refname starts with "." */
+	if (allow_caret_prefix && *current == '^')
+		start++;
 
-	for (current = name; ; current++) {
+	for (current = start; ; current++) {
 		if (*current == '\0' || *current == '/')
 			break;
 
@@ -877,7 +880,7 @@ static int ensure_segment_validity(const char *name, char may_contain_glob)
 	return segment_len;
 }
 
-static bool is_all_caps_and_underscore(const char *name, size_t len)
+static bool is_valid_normalized_name(const char *name, size_t len)
 {
 	size_t i;
 	char c;
@@ -888,6 +891,9 @@ static bool is_all_caps_and_underscore(const char *name, size_t len)
 	for (i = 0; i < len; i++)
 	{
 		c = name[i];
+		if (i == 0 && c == '^')
+			continue; /* The first character is allowed to be "^" for negative refspecs */
+
 		if ((c < 'A' || c > 'Z') && c != '_')
 			return false;
 	}
@@ -908,6 +914,7 @@ int git_reference__normalize_name(
 	int segment_len, segments_count = 0, error = GIT_EINVALIDSPEC;
 	unsigned int process_flags;
 	bool normalize = (buf != NULL);
+	bool allow_caret_prefix = true;
 	bool validate = (flags & GIT_REFERENCE_FORMAT__VALIDATION_DISABLE) == 0;
 
 #ifdef GIT_USE_ICONV
@@ -945,7 +952,7 @@ int git_reference__normalize_name(
 	while (true) {
 		char may_contain_glob = process_flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
 
-		segment_len = ensure_segment_validity(current, may_contain_glob);
+		segment_len = ensure_segment_validity(current, may_contain_glob, allow_caret_prefix);
 		if (segment_len < 0)
 			goto cleanup;
 
@@ -981,6 +988,12 @@ int git_reference__normalize_name(
 			break;
 
 		current += segment_len + 1;
+
+		/*
+		 * A caret prefix is only allowed in the first segment to signify a
+		 * negative refspec.
+		 */
+		allow_caret_prefix = false;
 	}
 
 	/* A refname can not be empty */
@@ -1000,12 +1013,12 @@ int git_reference__normalize_name(
 
 	if ((segments_count == 1 ) &&
 	    !(flags & GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND) &&
-		!(is_all_caps_and_underscore(name, (size_t)segment_len) ||
+		!(is_valid_normalized_name(name, (size_t)segment_len) ||
 			((flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN) && !strcmp("*", name))))
 			goto cleanup;
 
 	if ((segments_count > 1)
-		&& (is_all_caps_and_underscore(name, strchr(name, '/') - name)))
+		&& (is_valid_normalized_name(name, strchr(name, '/') - name)))
 			goto cleanup;
 
 	error = 0;
@@ -1080,6 +1093,12 @@ int git_reference_cmp(
 	return git_oid__cmp(&ref1->target.oid, &ref2->target.oid);
 }
 
+int git_reference__cmp_cb(const void *a, const void *b)
+{
+	return git_reference_cmp(
+		(const git_reference *)a, (const git_reference *)b);
+}
+
 /*
  * Starting with the reference given by `ref_name`, follows symbolic
  * references until a direct reference is found and updated the OID

data/vendor/libgit2/src/libgit2/refs.h

@@ -12,7 +12,6 @@
 #include "git2/oid.h"
 #include "git2/refs.h"
 #include "git2/refdb.h"
-#include "strmap.h"
 #include "str.h"
 #include "oid.h"
 
@@ -92,6 +91,12 @@ int git_reference__is_tag(const char *ref_name);
 int git_reference__is_note(const char *ref_name);
 const char *git_reference__shorthand(const char *name);
 
+/*
+ * A `git_reference_cmp` wrapper suitable for passing to generic
+ * comparators, like `vector_cmp` / `tsort` / etc.
+ */
+int git_reference__cmp_cb(const void *a, const void *b);
+
 /**
  * Lookup a reference by name and try to resolve to an OID.
  *

data/vendor/libgit2/src/libgit2/refspec.c

@@ -22,6 +22,7 @@ int git_refspec__parse(git_refspec *refspec, const char *input, bool is_fetch)
 	const char *lhs, *rhs;
 	int valid = 0;
 	unsigned int flags;
+	bool is_neg_refspec = false;
 
 	GIT_ASSERT_ARG(refspec);
 	GIT_ASSERT_ARG(input);
@@ -34,6 +35,9 @@ int git_refspec__parse(git_refspec *refspec, const char *input, bool is_fetch)
 		refspec->force = 1;
 		lhs++;
 	}
+	if (*lhs == '^') {
+		is_neg_refspec = true;
+	}
 
 	rhs = strrchr(lhs, ':');
 
@@ -62,7 +66,14 @@ int git_refspec__parse(git_refspec *refspec, const char *input, bool is_fetch)
 
 	llen = (rhs ? (size_t)(rhs - lhs - 1) : strlen(lhs));
 	if (1 <= llen && memchr(lhs, '*', llen)) {
-		if ((rhs && !is_glob) || (!rhs && is_fetch))
+		/*
+		 * If the lefthand side contains a glob, then one of the following must be
+		 * true, otherwise the spec is invalid
+		 *   1) the rhs exists and also contains a glob
+		 *   2) it is a negative refspec (i.e. no rhs)
+		 *   3) the rhs doesn't exist and we're fetching
+		 */
+		if ((rhs && !is_glob) || (rhs && is_neg_refspec) || (!rhs && is_fetch && !is_neg_refspec))
 			goto invalid;
 		is_glob = 1;
 	} else if (rhs && is_glob)
@@ -225,6 +236,14 @@ int git_refspec_force(const git_refspec *refspec)
 	return refspec->force;
 }
 
+int git_refspec_src_matches_negative(const git_refspec *refspec, const char *refname)
+{
+	if (refspec == NULL || refspec->src == NULL || !git_refspec_is_negative(refspec))
+		return false;
+
+	return (wildmatch(refspec->src + 1, refname, 0) == 0);
+}
+
 int git_refspec_src_matches(const git_refspec *refspec, const char *refname)
 {
 	if (refspec == NULL || refspec->src == NULL)
@@ -340,6 +359,14 @@ int git_refspec_is_wildcard(const git_refspec *spec)
 	return (spec->src[strlen(spec->src) - 1] == '*');
 }
 
+int git_refspec_is_negative(const git_refspec *spec)
+{
+	GIT_ASSERT_ARG(spec);
+	GIT_ASSERT_ARG(spec->src);
+
+	return (spec->src[0] == '^' && spec->dst == NULL);
+}
+
 git_direction git_refspec_direction(const git_refspec *spec)
 {
 	GIT_ASSERT_ARG(spec);

data/vendor/libgit2/src/libgit2/refspec.h

@@ -45,6 +45,14 @@ int git_refspec__serialize(git_str *out, const git_refspec *refspec);
  */
 int git_refspec_is_wildcard(const git_refspec *spec);
 
+/**
+ * Determines if a refspec is a negative refspec.
+ *
+ * @param spec the refspec
+ * @return 1 if the refspec is a negative, 0 otherwise
+ */
+int git_refspec_is_negative(const git_refspec *spec);
+
 /**
  * DWIM `spec` with `refs` existing on the remote, append the dwim'ed
  * result in `out`.

data/vendor/libgit2/src/libgit2/remote.c

@@ -1293,9 +1293,9 @@ static int git_remote__download(
 	free_refspecs(&remote->active_refspecs);
 	error = dwim_refspecs(&remote->active_refspecs, to_active, &refs);
 
-	git_vector_free(&refs);
+	git_vector_dispose(&refs);
 	free_refspecs(&specs);
-	git_vector_free(&specs);
+	git_vector_dispose(&specs);
 
 	if (error < 0)
 		goto on_error;
@@ -1311,9 +1311,9 @@ static int git_remote__download(
 	error = git_fetch_download_pack(remote);
 
 on_error:
-	git_vector_free(&refs);
+	git_vector_dispose(&refs);
 	free_refspecs(&specs);
-	git_vector_free(&specs);
+	git_vector_dispose(&specs);
 	return error;
 }
 
@@ -1339,7 +1339,11 @@ int git_remote_download(
 	if ((error = connect_or_reset_options(remote, GIT_DIRECTION_FETCH, &connect_opts)) < 0)
 		return error;
 
-	return git_remote__download(remote, refspecs, opts);
+	error = git_remote__download(remote, refspecs, opts);
+
+	git_remote_connect_options_dispose(&connect_opts);
+
+	return error;
 }
 
 int git_remote_fetch(
@@ -1348,13 +1352,14 @@ int git_remote_fetch(
 	const git_fetch_options *opts,
 	const char *reflog_message)
 {
-	int error, update_fetchhead = 1;
 	git_remote_autotag_option_t tagopt = remote->download_tags;
 	bool prune = false;
 	git_str reflog_msg_buf = GIT_STR_INIT;
 	git_remote_connect_options connect_opts = GIT_REMOTE_CONNECT_OPTIONS_INIT;
 	unsigned int capabilities;
 	git_oid_t oid_type;
+	unsigned int update_flags = GIT_REMOTE_UPDATE_FETCHHEAD;
+	int error;
 
 	GIT_ASSERT_ARG(remote);
 
@@ -1371,7 +1376,7 @@ int git_remote_fetch(
 		return error;
 
 	if (opts) {
-		update_fetchhead = opts->update_fetchhead;
+		update_flags = opts->update_fetchhead;
 		tagopt = opts->download_tags;
 	}
 
@@ -1398,8 +1403,14 @@ int git_remote_fetch(
 	}
 
 	/* Create "remote/foo" branches for all remote branches */
-	error = git_remote_update_tips(remote, &connect_opts.callbacks, update_fetchhead, tagopt, git_str_cstr(&reflog_msg_buf));
+	error = git_remote_update_tips(remote,
+		&connect_opts.callbacks,
+		update_flags,
+		tagopt,
+		git_str_cstr(&reflog_msg_buf));
+
 	git_str_dispose(&reflog_msg_buf);
+
 	if (error < 0)
 		goto done;
 
@@ -1578,7 +1589,7 @@ cleanup:
 	for (i = 0; i < fetchhead_refs.length; ++i)
 		git_fetchhead_ref_free(fetchhead_refs.contents[i]);
 
-	git_vector_free(&fetchhead_refs);
+	git_vector_dispose(&fetchhead_refs);
 	git_reference_free(head_ref);
 
 	return error;
@@ -1713,19 +1724,28 @@ int git_remote_prune(git_remote *remote, const git_remote_callbacks *callbacks)
 		git_oid_cpy(&id, git_reference_target(ref));
 		error = git_reference_delete(ref);
 		git_reference_free(ref);
+
 		if (error < 0)
 			goto cleanup;
 
-		if (callbacks && callbacks->update_tips)
-			error = callbacks->update_tips(refname, &id, &zero_id, callbacks->payload);
+		if (callbacks && callbacks->update_refs)
+			error = callbacks->update_refs(refname, &id,
+				&zero_id, NULL, callbacks->payload);
+#ifndef GIT_DEPRECATE_HARD
+		else if (callbacks && callbacks->update_tips)
+			error = callbacks->update_tips(refname, &id,
+				&zero_id, callbacks->payload);
+#endif
 
-		if (error < 0)
+		if (error < 0) {
+			git_error_set_after_callback_function(error, "git_remote_fetch");
 			goto cleanup;
+		}
 	}
 
 cleanup:
-	git_vector_free(&remote_refs);
-	git_vector_free_deep(&candidates);
+	git_vector_dispose(&remote_refs);
+	git_vector_dispose_deep(&candidates);
 	return error;
 }
 
@@ -1733,6 +1753,7 @@ static int update_ref(
 	const git_remote *remote,
 	const char *ref_name,
 	git_oid *id,
+	git_refspec *spec,
 	const char *msg,
 	const git_remote_callbacks *callbacks)
 {
@@ -1761,9 +1782,19 @@ static int update_ref(
 	if (error < 0)
 		return error;
 
-	if (callbacks && callbacks->update_tips &&
-	    (error = callbacks->update_tips(ref_name, &old_id, id, callbacks->payload)) < 0)
+	if (callbacks && callbacks->update_refs)
+		error = callbacks->update_refs(ref_name, &old_id,
+			id, spec, callbacks->payload);
+#ifndef GIT_DEPRECATE_HARD
+	else if (callbacks && callbacks->update_tips)
+		error = callbacks->update_tips(ref_name, &old_id,
+			id, callbacks->payload);
+#endif
+
+	if (error < 0) {
+		git_error_set_after_callback_function(error, "git_remote_fetch");
 		return error;
+	}
 
 	return 0;
 }
@@ -1774,6 +1805,7 @@ static int update_one_tip(
 	git_refspec *spec,
 	git_remote_head *head,
 	git_refspec *tagspec,
+	unsigned int update_flags,
 	git_remote_autotag_option_t tagopt,
 	const char *log_message,
 	const git_remote_callbacks *callbacks)
@@ -1781,7 +1813,7 @@ static int update_one_tip(
 	git_odb *odb;
 	git_str refname = GIT_STR_INIT;
 	git_reference *ref = NULL;
-	bool autotag = false;
+	bool autotag = false, updated = false;
 	git_oid old;
 	int valid;
 	int error;
@@ -1855,22 +1887,33 @@ static int update_one_tip(
 			goto done;
 	}
 
-	if (!git_oid__cmp(&old, &head->oid))
-		goto done;
+	if ((updated = !git_oid_equal(&old, &head->oid))) {
+		/* In autotag mode, don't overwrite any locally-existing tags */
+		error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag,
+				log_message);
 
-	/* In autotag mode, don't overwrite any locally-existing tags */
-	error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag,
-			log_message);
+		if (error < 0) {
+			if (error == GIT_EEXISTS)
+				error = 0;
 
-	if (error < 0) {
-		if (error == GIT_EEXISTS)
-			error = 0;
+			goto done;
+		}
+	}
 
+	if (!callbacks ||
+	    (!updated && (update_flags & GIT_REMOTE_UPDATE_REPORT_UNCHANGED) == 0))
 		goto done;
-	}
 
-	if (callbacks && callbacks->update_tips != NULL &&
-	    (error = callbacks->update_tips(refname.ptr, &old, &head->oid, callbacks->payload)) < 0)
+	if (callbacks && callbacks->update_refs)
+		error = callbacks->update_refs(refname.ptr, &old,
+			&head->oid, spec, callbacks->payload);
+#ifndef GIT_DEPRECATE_HARD
+	else if (callbacks && callbacks->update_tips)
+		error = callbacks->update_tips(refname.ptr, &old,
+			&head->oid, callbacks->payload);
+#endif
+
+	if (error < 0)
 		git_error_set_after_callback_function(error, "git_remote_fetch");
 
 done:
@@ -1882,7 +1925,7 @@ done:
 static int update_tips_for_spec(
 	git_remote *remote,
 	const git_remote_callbacks *callbacks,
-	int update_fetchhead,
+	unsigned int update_flags,
 	git_remote_autotag_option_t tagopt,
 	git_refspec *spec,
 	git_vector *refs,
@@ -1905,7 +1948,10 @@ static int update_tips_for_spec(
 
 	/* Update tips based on the remote heads */
 	git_vector_foreach(refs, i, head) {
-		if (update_one_tip(&update_heads, remote, spec, head, &tagspec, tagopt, log_message, callbacks) < 0)
+		if (update_one_tip(&update_heads,
+				remote, spec, head, &tagspec,
+				update_flags, tagopt, log_message,
+				callbacks) < 0)
 			goto on_error;
 	}
 
@@ -1917,7 +1963,7 @@ static int update_tips_for_spec(
 			goto on_error;
 
 		if (spec->dst &&
-		     (error = update_ref(remote, spec->dst, &id, log_message, callbacks)) < 0)
+		     (error = update_ref(remote, spec->dst, &id, spec, log_message, callbacks)) < 0)
 			goto on_error;
 
 		git_oid_cpy(&oid_head.oid, &id);
@@ -1927,17 +1973,17 @@ static int update_tips_for_spec(
 			goto on_error;
 	}
 
-	if (update_fetchhead &&
+	if ((update_flags & GIT_REMOTE_UPDATE_FETCHHEAD) &&
 	    (error = git_remote_write_fetchhead(remote, spec, &update_heads)) < 0)
 		goto on_error;
 
 	git_refspec__dispose(&tagspec);
-	git_vector_free(&update_heads);
+	git_vector_dispose(&update_heads);
 	return 0;
 
 on_error:
 	git_refspec__dispose(&tagspec);
-	git_vector_free(&update_heads);
+	git_vector_dispose(&update_heads);
 	return -1;
 
 }
@@ -2029,7 +2075,7 @@ static int opportunistic_updates(
 
 		git_str_clear(&refname);
 		if ((error = git_refspec__transform(&refname, spec, head->name)) < 0 ||
-		    (error = update_ref(remote, refname.ptr, &head->oid, msg, callbacks)) < 0)
+		    (error = update_ref(remote, refname.ptr, &head->oid, spec, msg, callbacks)) < 0)
 			goto cleanup;
 	}
 
@@ -2058,11 +2104,11 @@ static int truncate_fetch_head(const char *gitdir)
 }
 
 int git_remote_update_tips(
-		git_remote *remote,
-		const git_remote_callbacks *callbacks,
-		int update_fetchhead,
-		git_remote_autotag_option_t download_tags,
-		const char *reflog_message)
+	git_remote *remote,
+	const git_remote_callbacks *callbacks,
+	unsigned int update_flags,
+	git_remote_autotag_option_t download_tags,
+	const char *reflog_message)
 {
 	git_refspec *spec, tagspec;
 	git_vector refs = GIT_VECTOR_INIT;
@@ -2091,7 +2137,7 @@ int git_remote_update_tips(
 		goto out;
 
 	if (tagopt == GIT_REMOTE_DOWNLOAD_TAGS_ALL) {
-		if ((error = update_tips_for_spec(remote, callbacks, update_fetchhead, tagopt, &tagspec, &refs, reflog_message)) < 0)
+		if ((error = update_tips_for_spec(remote, callbacks, update_flags, tagopt, &tagspec, &refs, reflog_message)) < 0)
 			goto out;
 	}
 
@@ -2099,7 +2145,7 @@ int git_remote_update_tips(
 		if (spec->push)
 			continue;
 
-		if ((error = update_tips_for_spec(remote, callbacks, update_fetchhead, tagopt, spec, &refs, reflog_message)) < 0)
+		if ((error = update_tips_for_spec(remote, callbacks, update_flags, tagopt, spec, &refs, reflog_message)) < 0)
 			goto out;
 	}
 
@@ -2108,7 +2154,7 @@ int git_remote_update_tips(
 		error = opportunistic_updates(remote, callbacks, &refs, reflog_message);
 
 out:
-	git_vector_free(&refs);
+	git_vector_dispose(&refs);
 	git_refspec__dispose(&tagspec);
 	return error;
 }
@@ -2167,19 +2213,19 @@ void git_remote_free(git_remote *remote)
 		remote->transport = NULL;
 	}
 
-	git_vector_free(&remote->refs);
+	git_vector_dispose(&remote->refs);
 
 	free_refspecs(&remote->refspecs);
-	git_vector_free(&remote->refspecs);
+	git_vector_dispose(&remote->refspecs);
 
 	free_refspecs(&remote->active_refspecs);
-	git_vector_free(&remote->active_refspecs);
+	git_vector_dispose(&remote->active_refspecs);
 
 	free_refspecs(&remote->passive_refspecs);
-	git_vector_free(&remote->passive_refspecs);
+	git_vector_dispose(&remote->passive_refspecs);
 
 	free_heads(&remote->local_heads);
-	git_vector_free(&remote->local_heads);
+	git_vector_dispose(&remote->local_heads);
 
 	git_push_free(remote->push);
 	git__free(remote->url);
@@ -2222,7 +2268,7 @@ int git_remote_list(git_strarray *remotes_list, git_repository *repo)
 		cfg, "^remote\\..*\\.(push)?url$", remote_list_cb, &list);
 
 	if (error < 0) {
-		git_vector_free_deep(&list);
+		git_vector_dispose_deep(&list);
 		return error;
 	}
 
@@ -2503,7 +2549,7 @@ static int rename_fetch_refspecs(git_vector *problems, git_remote *remote, const
 		git_vector_foreach(problems, i, str)
 			git__free(str);
 
-		git_vector_free(problems);
+		git_vector_dispose(problems);
 	}
 
 	return error;
@@ -2543,7 +2589,7 @@ int git_remote_rename(git_strarray *out, git_repository *repo, const char *name,
 
 cleanup:
 	if (error < 0)
-		git_vector_free(&problem_refspecs);
+		git_vector_dispose(&problem_refspecs);
 
 	git_remote_free(remote);
 	return error;
@@ -2582,17 +2628,21 @@ done:
 git_refspec *git_remote__matching_refspec(git_remote *remote, const char *refname)
 {
 	git_refspec *spec;
+	git_refspec *match = NULL;
 	size_t i;
 
 	git_vector_foreach(&remote->active_refspecs, i, spec) {
 		if (spec->push)
 			continue;
 
-		if (git_refspec_src_matches(spec, refname))
-			return spec;
+		if (git_refspec_src_matches_negative(spec, refname))
+			return NULL;
+
+		if (git_refspec_src_matches(spec, refname) && match == NULL)
+			match = spec;
 	}
 
-	return NULL;
+	return match;
 }
 
 git_refspec *git_remote__matching_dst_refspec(git_remote *remote, const char *refname)
@@ -2650,7 +2700,7 @@ static int copy_refspecs(git_strarray *array, const git_remote *remote, unsigned
 	return 0;
 
 on_error:
-	git_vector_free_deep(&refspecs);
+	git_vector_dispose_deep(&refspecs);
 
 	return -1;
 }
@@ -2798,7 +2848,7 @@ cleanup:
 	git_vector_foreach(&refs, i, dup) {
 		git__free(dup);
 	}
-	git_vector_free(&refs);
+	git_vector_dispose(&refs);
 	return error;
 }
 
@@ -2967,12 +3017,22 @@ int git_remote_upload(
 		}
 	}
 
-	if ((error = git_push_finish(push)) < 0)
-		goto cleanup;
+	if (opts && opts->remote_push_options.count > 0)
+		for (i = 0; i < opts->remote_push_options.count; ++i) {
+			char *optstr = git__strdup(opts->remote_push_options.strings[i]);
+			GIT_ERROR_CHECK_ALLOC(optstr);
 
-	if (connect_opts.callbacks.push_update_reference &&
-	    (error = git_push_status_foreach(push, connect_opts.callbacks.push_update_reference, connect_opts.callbacks.payload)) < 0)
-		goto cleanup;
+			if ((error = git_vector_insert(&push->remote_push_options, optstr)) < 0)
+				goto cleanup;
+		}
+
+	error = git_push_finish(push);
+
+	if (connect_opts.callbacks.push_update_reference) {
+		const int cb_error = git_push_status_foreach(push, connect_opts.callbacks.push_update_reference, connect_opts.callbacks.payload);
+		if (!error)
+			error = cb_error;
+	}
 
 cleanup:
 	git_remote_connect_options_dispose(&connect_opts);