rugged 1.1.0 → 1.2.0

data/vendor/libgit2/src/tag.c

@@ -27,25 +27,25 @@ void git_tag__free(void *_tag)
 
 int git_tag_target(git_object **target, const git_tag *t)
 {
-	assert(t);
+	GIT_ASSERT_ARG(t);
 	return git_object_lookup(target, t->object.repo, &t->target, t->type);
 }
 
 const git_oid *git_tag_target_id(const git_tag *t)
 {
-	assert(t);
+	GIT_ASSERT_ARG_WITH_RETVAL(t, NULL);
 	return &t->target;
 }
 
 git_object_t git_tag_target_type(const git_tag *t)
 {
-	assert(t);
+	GIT_ASSERT_ARG_WITH_RETVAL(t, GIT_OBJECT_INVALID);
 	return t->type;
 }
 
 const char *git_tag_name(const git_tag *t)
 {
-	assert(t);
+	GIT_ASSERT_ARG_WITH_RETVAL(t, NULL);
 	return t->tag_name;
 }
 
@@ -56,7 +56,7 @@ const git_signature *git_tag_tagger(const git_tag *t)
 
 const char *git_tag_message(const git_tag *t)
 {
-	assert(t);
+	GIT_ASSERT_ARG_WITH_RETVAL(t, NULL);
 	return t->message;
 }
 
@@ -259,8 +259,10 @@ static int git_tag_create__internal(
 
 	int error;
 
-	assert(repo && tag_name && target);
-	assert(!create_tag_annotation || (tagger && message));
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(tag_name);
+	GIT_ASSERT_ARG(target);
+	GIT_ASSERT_ARG(!create_tag_annotation || (tagger && message));
 
 	if (git_object_owner(target) != repo) {
 		git_error_set(GIT_ERROR_INVALID, "the given target does not belong to this repository");
@@ -313,7 +315,12 @@ int git_tag_annotation_create(
 	const git_signature *tagger,
 	const char *message)
 {
-	assert(oid && repo && tag_name && target && tagger && message);
+	GIT_ASSERT_ARG(oid);
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(tag_name);
+	GIT_ASSERT_ARG(target);
+	GIT_ASSERT_ARG(tagger);
+	GIT_ASSERT_ARG(message);
 
 	return write_tag_annotation(oid, repo, tag_name, target, tagger, message);
 }
@@ -339,7 +346,8 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 	git_reference *new_ref = NULL;
 	git_buf ref_name = GIT_BUF_INIT;
 
-	assert(oid && buffer);
+	GIT_ASSERT_ARG(oid);
+	GIT_ASSERT_ARG(buffer);
 
 	memset(&tag, 0, sizeof(tag));
 
@@ -454,7 +462,8 @@ int git_tag_foreach(git_repository *repo, git_tag_foreach_cb cb, void *cb_data)
 {
 	tag_cb_data data;
 
-	assert(repo && cb);
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(cb);
 
 	data.cb = cb;
 	data.cb_data = cb_data;
@@ -493,7 +502,9 @@ int git_tag_list_match(git_strarray *tag_names, const char *pattern, git_reposit
 	tag_filter_data filter;
 	git_vector taglist;
 
-	assert(tag_names && repo && pattern);
+	GIT_ASSERT_ARG(tag_names);
+	GIT_ASSERT_ARG(repo);
+	GIT_ASSERT_ARG(pattern);
 
 	if ((error = git_vector_init(&taglist, 8, NULL)) < 0)
 		return error;
@@ -522,6 +533,31 @@ int git_tag_peel(git_object **tag_target, const git_tag *tag)
 	return git_object_peel(tag_target, (const git_object *)tag, GIT_OBJECT_ANY);
 }
 
+int git_tag_name_is_valid(int *valid, const char *name)
+{
+	git_buf ref_name = GIT_BUF_INIT;
+	int error = 0;
+
+	GIT_ASSERT(valid);
+
+	/*
+	 * Discourage tag name starting with dash,
+	 * https://github.com/git/git/commit/4f0accd638b8d2
+	 */
+	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)
+		goto done;
+
+	error = git_reference_name_is_valid(valid, ref_name.ptr);
+
+done:
+	git_buf_dispose(&ref_name);
+	return error;
+}
+
 /* Deprecated Functions */
 
 #ifndef GIT_DEPRECATE_HARD

data/vendor/libgit2/src/thread.c

@@ -0,0 +1,140 @@
+/*
+ * 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.
+ */
+
+#include "common.h"
+
+#if !defined(GIT_THREADS)
+
+#define TLSDATA_MAX 16
+
+typedef struct {
+	void *value;
+	void (GIT_SYSTEM_CALL *destroy_fn)(void *);
+} tlsdata_value;
+
+static tlsdata_value tlsdata_values[TLSDATA_MAX];
+static int tlsdata_cnt = 0;
+
+int git_tlsdata_init(git_tlsdata_key *key, void (GIT_SYSTEM_CALL *destroy_fn)(void *))
+{
+	if (tlsdata_cnt >= TLSDATA_MAX)
+		return -1;
+
+	tlsdata_values[tlsdata_cnt].value = NULL;
+	tlsdata_values[tlsdata_cnt].destroy_fn = destroy_fn;
+
+	*key = tlsdata_cnt;
+	tlsdata_cnt++;
+
+	return 0;
+}
+
+int git_tlsdata_set(git_tlsdata_key key, void *value)
+{
+	if (key < 0 || key > tlsdata_cnt)
+		return -1;
+
+	tlsdata_values[key].value = value;
+	return 0;
+}
+
+void *git_tlsdata_get(git_tlsdata_key key)
+{
+	if (key < 0 || key > tlsdata_cnt)
+		return NULL;
+
+	return tlsdata_values[key].value;
+}
+
+int git_tlsdata_dispose(git_tlsdata_key key)
+{
+	void *value;
+	void (*destroy_fn)(void *) = NULL;
+
+	if (key < 0 || key > tlsdata_cnt)
+		return -1;
+
+	value = tlsdata_values[key].value;
+	destroy_fn = tlsdata_values[key].destroy_fn;
+
+	tlsdata_values[key].value = NULL;
+	tlsdata_values[key].destroy_fn = NULL;
+
+	if (value && destroy_fn)
+		destroy_fn(value);
+
+	return 0;
+}
+
+#elif defined(GIT_WIN32)
+
+int git_tlsdata_init(git_tlsdata_key *key, void (GIT_SYSTEM_CALL *destroy_fn)(void *))
+{
+	DWORD fls_index = FlsAlloc(destroy_fn);
+
+	if (fls_index == FLS_OUT_OF_INDEXES)
+		return -1;
+
+	*key = fls_index;
+	return 0;
+}
+
+int git_tlsdata_set(git_tlsdata_key key, void *value)
+{
+	if (!FlsSetValue(key, value))
+		return -1;
+
+	return 0;
+}
+
+void *git_tlsdata_get(git_tlsdata_key key)
+{
+	return FlsGetValue(key);
+}
+
+int git_tlsdata_dispose(git_tlsdata_key key)
+{
+	if (!FlsFree(key))
+		return -1;
+
+	return 0;
+}
+
+#elif defined(_POSIX_THREADS)
+
+int git_tlsdata_init(git_tlsdata_key *key, void (GIT_SYSTEM_CALL *destroy_fn)(void *))
+{
+	if (pthread_key_create(key, destroy_fn) != 0)
+		return -1;
+
+	return 0;
+}
+
+int git_tlsdata_set(git_tlsdata_key key, void *value)
+{
+	if (pthread_setspecific(key, value) != 0)
+		return -1;
+
+	return 0;
+}
+
+void *git_tlsdata_get(git_tlsdata_key key)
+{
+	return pthread_getspecific(key);
+}
+
+int git_tlsdata_dispose(git_tlsdata_key key)
+{
+	if (pthread_key_delete(key) != 0)
+		return -1;
+
+	return 0;
+}
+
+#else
+# error unknown threading model
+#endif