rugged 1.9.0 → 1.9.4

data/ext/rugged/rugged_revwalk.c

@@ -12,15 +12,25 @@ extern VALUE rb_cRuggedObject;
 VALUE rb_cRuggedWalker;
 
 extern const rb_data_type_t rugged_object_type;
+extern const rb_data_type_t rugged_repository_type;
 
-static void rb_git_walk__free(git_revwalk *walk)
+static void rb_git_walk__free(void *data)
 {
+	git_revwalk *walk = (git_revwalk *) data;
 	git_revwalk_free(walk);
 }
 
+const rb_data_type_t rugged_walk_type = {
+	.wrap_struct_name = "Rugged::Walker",
+	.function = {
+		.dfree = rb_git_walk__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rugged_walker_new(VALUE klass, VALUE owner, git_revwalk *walk)
 {
-	VALUE rb_walk = Data_Wrap_Struct(klass, NULL, &rb_git_walk__free, walk);
+	VALUE rb_walk = TypedData_Wrap_Struct(klass, &rugged_walk_type, walk);
 	rugged_set_owner(rb_walk, owner);
 	return rb_walk;
 }
@@ -90,7 +100,7 @@ static VALUE rb_git_walker_new(VALUE klass, VALUE rb_repo)
 	git_revwalk *walk;
 	int error;
 
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	error = git_revwalk_new(&walk, repo);
 	rugged_exception_check(error);
@@ -117,7 +127,7 @@ static VALUE rb_git_walker_new(VALUE klass, VALUE rb_repo)
 static VALUE rb_git_walker_push(VALUE self, VALUE rb_commit)
 {
 	git_revwalk *walk;
-	Data_Get_Struct(self, git_revwalk, walk);
+	TypedData_Get_Struct(self, git_revwalk, &rugged_walk_type, walk);
 	push_commit(walk, rb_commit, 0);
 	return Qnil;
 }
@@ -125,7 +135,7 @@ static VALUE rb_git_walker_push(VALUE self, VALUE rb_commit)
 static VALUE rb_git_walker_push_range(VALUE self, VALUE range)
 {
 	git_revwalk *walk;
-	Data_Get_Struct(self, git_revwalk, walk);
+	TypedData_Get_Struct(self, git_revwalk, &rugged_walk_type, walk);
 	rugged_exception_check(git_revwalk_push_range(walk, StringValueCStr(range)));
 	return Qnil;
 }
@@ -140,7 +150,7 @@ static VALUE rb_git_walker_push_range(VALUE self, VALUE range)
 static VALUE rb_git_walker_hide(VALUE self, VALUE rb_commit)
 {
 	git_revwalk *walk;
-	Data_Get_Struct(self, git_revwalk, walk);
+	TypedData_Get_Struct(self, git_revwalk, &rugged_walk_type, walk);
 	push_commit(walk, rb_commit, 1);
 	return Qnil;
 }
@@ -156,7 +166,7 @@ static VALUE rb_git_walker_hide(VALUE self, VALUE rb_commit)
 static VALUE rb_git_walker_sorting(VALUE self, VALUE ruby_sort_mode)
 {
 	git_revwalk *walk;
-	Data_Get_Struct(self, git_revwalk, walk);
+	TypedData_Get_Struct(self, git_revwalk, &rugged_walk_type, walk);
 	git_revwalk_sorting(walk, FIX2INT(ruby_sort_mode));
 	return Qnil;
 }
@@ -170,7 +180,7 @@ static VALUE rb_git_walker_sorting(VALUE self, VALUE ruby_sort_mode)
 static VALUE rb_git_walker_simplify_first_parent(VALUE self)
 {
 	git_revwalk *walk;
-	Data_Get_Struct(self, git_revwalk, walk);
+	TypedData_Get_Struct(self, git_revwalk, &rugged_walk_type, walk);
 	git_revwalk_simplify_first_parent(walk);
 	return Qnil;
 }
@@ -192,7 +202,7 @@ static VALUE rb_git_walker_count(int argc, VALUE *argv, VALUE self)
 	if (argc > 0 || rb_block_given_p())
 		return rb_call_super(argc, argv);
 
-	Data_Get_Struct(self, git_revwalk, walk);
+	TypedData_Get_Struct(self, git_revwalk, &rugged_walk_type, walk);
 
 	while (((error = git_revwalk_next(&commit_oid, walk)) == 0) && ++count != UINT64_MAX);
 
@@ -212,7 +222,7 @@ static VALUE rb_git_walker_count(int argc, VALUE *argv, VALUE self)
 static VALUE rb_git_walker_reset(VALUE self)
 {
 	git_revwalk *walk;
-	Data_Get_Struct(self, git_revwalk, walk);
+	TypedData_Get_Struct(self, git_revwalk, &rugged_walk_type, walk);
 	git_revwalk_reset(walk);
 	return Qnil;
 }
@@ -370,7 +380,7 @@ static VALUE rb_git_walk(int argc, VALUE *argv, VALUE self)
 	RETURN_ENUMERATOR(self, argc, argv);
 	rb_scan_args(argc, argv, "10:", &rb_repo, &rb_options);
 
-	Data_Get_Struct(rb_repo, git_repository, w.repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, w.repo);
 	rugged_exception_check(git_revwalk_new(&w.walk, w.repo));
 
 	w.rb_owner = rb_repo;
@@ -402,7 +412,7 @@ static VALUE rb_git_walk_with_opts(int argc, VALUE *argv, VALUE self, int oid_on
 	RETURN_ENUMERATOR(self, argc, argv);
 	rb_scan_args(argc, argv, "01", &rb_options);
 
-	Data_Get_Struct(self, git_revwalk, w.walk);
+	TypedData_Get_Struct(self, git_revwalk, &rugged_walk_type, w.walk);
 	w.repo = git_revwalk_repository(w.walk);
 
 	w.rb_owner = rugged_owner(self);

data/ext/rugged/rugged_submodule.c

@@ -18,6 +18,9 @@ static ID id_ignore_none, id_ignore_untracked, id_ignore_dirty, id_ignore_all;
 
 static ID id_update_checkout, id_update_rebase, id_update_merge, id_update_none;
 
+extern const rb_data_type_t rugged_repository_type;
+extern const rb_data_type_t rugged_submodule_type;
+
 void init_status_list(void)
 {
 	id_in_head            = CSTR2SYM("in_head");
@@ -153,8 +156,8 @@ static VALUE rb_git_submodule_status(VALUE self)
 	unsigned int flags;
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	rugged_exception_check(
 		git_submodule_status(&flags, repo, git_submodule_name(submodule),
@@ -168,7 +171,7 @@ static VALUE rb_git_submodule_status(VALUE self)
 #define RB_GIT_SUBMODULE_LOCATION_FLAG_CHECK(flag) \
 	git_submodule *submodule; \
 	unsigned int flags; \
-	Data_Get_Struct(self, git_submodule, submodule); \
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule); \
 	rugged_exception_check( \
 		git_submodule_location(&flags, submodule) \
 	); \
@@ -224,8 +227,8 @@ static VALUE rb_git_submodule_status_in_workdir(VALUE self)
 	git_submodule *submodule; \
 	unsigned int flags; \
 	rugged_check_repo(rb_repo); \
-	Data_Get_Struct(rb_repo, git_repository, repo); \
-	Data_Get_Struct(self, git_submodule, submodule); \
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo); \
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule); \
 	rugged_exception_check( \
 		git_submodule_status(&flags, repo, git_submodule_name(submodule), \
 			GIT_SUBMODULE_IGNORE_UNSPECIFIED) \
@@ -348,8 +351,8 @@ static VALUE rb_git_submodule_status_untracked_files_in_workdir(VALUE self)
 	git_submodule *submodule; \
 	unsigned int flags; \
 	rugged_check_repo(rb_repo); \
-	Data_Get_Struct(rb_repo, git_repository, repo); \
-	Data_Get_Struct(self, git_submodule, submodule); \
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo); \
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule); \
 	rugged_exception_check( \
 		git_submodule_status(&flags, repo, git_submodule_name(submodule), \
 			GIT_SUBMODULE_IGNORE_UNSPECIFIED) \
@@ -401,7 +404,7 @@ static VALUE rb_git_submodule_add_to_index(int argc, VALUE *argv, VALUE self)
 	VALUE rb_options;
 	int write_index = 1;
 
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	rb_scan_args(argc, argv, ":", &rb_options);
 
@@ -431,7 +434,7 @@ static VALUE rb_git_submodule_add_to_index(int argc, VALUE *argv, VALUE self)
 static VALUE rb_git_submodule_reload(VALUE self)
 {
 	git_submodule *submodule;
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	rugged_exception_check(
 		git_submodule_reload(submodule, 1)
@@ -454,7 +457,7 @@ static VALUE rb_git_submodule_reload(VALUE self)
 static VALUE rb_git_submodule_sync(VALUE self)
 {
 	git_submodule *submodule;
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	rugged_exception_check(
 		git_submodule_sync(submodule)
@@ -485,7 +488,7 @@ static VALUE rb_git_submodule_init(int argc, VALUE *argv, VALUE self)
 	VALUE rb_options;
 	int overwrite = 0;
 
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	rb_scan_args(argc, argv, ":", &rb_options);
 
@@ -514,7 +517,7 @@ static VALUE rb_git_submodule_name(VALUE self)
 	git_submodule *submodule;
 	const char *name;
 
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	name = git_submodule_name(submodule);
 
@@ -533,7 +536,7 @@ static VALUE rb_git_submodule_url(VALUE self)
 	git_submodule *submodule;
 	const char *url;
 
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	url = git_submodule_url(submodule);
 
@@ -554,7 +557,7 @@ static VALUE rb_git_submodule_path(VALUE self)
 	git_submodule *submodule;
 	const char *path;
 
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	path = git_submodule_path(submodule);
 
@@ -564,7 +567,7 @@ static VALUE rb_git_submodule_path(VALUE self)
 #define RB_GIT_OID_GETTER(_klass, _attribute) \
 	git_##_klass *object; \
 	const git_oid * oid; \
-	Data_Get_Struct(self, git_##_klass, object); \
+	TypedData_Get_Struct(self, git_##_klass, &rugged_##_klass##_type, object);	\
 	oid = git_##_klass##_##_attribute(object); \
 	return oid ? rugged_create_oid(oid) : Qnil; \
 
@@ -625,7 +628,7 @@ static VALUE rb_git_submodule_wd_id(VALUE self)
 static VALUE rb_git_submodule_fetch_recurse_submodules(VALUE self)
 {
 	git_submodule *submodule;
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	return git_submodule_fetch_recurse_submodules(submodule) ? Qtrue : Qfalse;
 }
@@ -676,7 +679,7 @@ static VALUE rb_git_submodule_ignore_rule(VALUE self)
 	git_submodule *submodule;
 	git_submodule_ignore_t ignore;
 
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 	ignore = git_submodule_ignore(submodule);
 
 	return rb_git_subm_ignore_rule_fromC(ignore);
@@ -723,7 +726,7 @@ static VALUE rb_git_submodule_update_rule(VALUE self)
 	git_submodule *submodule;
 	git_submodule_update_t update;
 
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 	update = git_submodule_update_strategy(submodule);
 
 	return rb_git_subm_update_rule_fromC(update);
@@ -744,7 +747,7 @@ static VALUE rb_git_submodule_repository(VALUE self)
 	git_submodule *submodule;
 	git_repository *repo;
 
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	rugged_exception_check(
 		git_submodule_open(&repo, submodule)
@@ -769,7 +772,7 @@ static VALUE rb_git_submodule_repository(VALUE self)
 static VALUE rb_git_submodule_finalize_add(VALUE self)
 {
 	git_submodule *submodule;
-	Data_Get_Struct(self, git_submodule, submodule);
+	TypedData_Get_Struct(self, git_submodule, &rugged_submodule_type, submodule);
 
 	rugged_exception_check(
 		git_submodule_add_finalize(submodule)

data/ext/rugged/rugged_submodule_collection.c

@@ -11,6 +11,8 @@ extern VALUE rb_mRugged;
 extern VALUE rb_cRuggedSubmodule;
 VALUE rb_cRuggedSubmoduleCollection;
 
+extern const rb_data_type_t rugged_repository_type;
+
 /*
  *  call-seq:
  *    SubmoduleCollection.new(repo) -> submodules
@@ -24,19 +26,28 @@ static VALUE rb_git_submodule_collection_initialize(VALUE self, VALUE rb_repo)
 	return self;
 }
 
-static void rb_git_submodule__free(git_submodule *submodule)
+static void rb_git_submodule__free(void *data)
 {
+	git_submodule *submodule = (git_submodule *) data;
 	git_submodule_free(submodule);
 }
 
+const rb_data_type_t rugged_submodule_type = {
+	.wrap_struct_name = "Rugged::Submodule",
+	.function = {
+		.dfree = rb_git_submodule__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+
 VALUE rugged_submodule_new(VALUE owner, git_submodule *submodule)
 {
 	VALUE rb_submodule;
 
-	rb_submodule = Data_Wrap_Struct(
+	rb_submodule = TypedData_Wrap_Struct(
 			rb_cRuggedSubmodule,
-			NULL,
-			&rb_git_submodule__free,
+			&rugged_submodule_type,
 			submodule);
 	rugged_set_owner(rb_submodule, owner);
 
@@ -63,7 +74,7 @@ static VALUE rb_git_submodule_collection_aref(VALUE self, VALUE rb_name)
 	int error;
 
 	VALUE rb_repo = rugged_owner(self);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	Check_Type(rb_name, T_STRING);
 
@@ -89,7 +100,7 @@ static int cb_submodule__each(git_submodule *submodule, const char *name, void *
 	VALUE rb_repo;
 
 	rb_repo = payload->rb_data;
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	/* The submodule passed here has it's refcount decreased just after
 	 * the foreach finishes. The only way to increase that refcount is
@@ -128,7 +139,7 @@ static VALUE rb_git_submodule_collection_each(VALUE self)
 
 	RETURN_ENUMERATOR(self, 0, 0);
 	rb_repo = rugged_owner(self);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	payload.exception = 0;
 	payload.rb_data = rb_repo;
@@ -184,7 +195,7 @@ static VALUE rb_git_submodule_setup_add(int argc, VALUE *argv, VALUE self)
 	Check_Type(rb_path, T_STRING);
 
 	rb_repo = rugged_owner(self);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	if (!NIL_P(rb_options)) {
 		VALUE rb_val;
@@ -281,7 +292,7 @@ static VALUE rb_git_submodule_update(VALUE self, VALUE rb_name_or_submodule, VAL
 	VALUE rb_url, rb_fetch_recurse_submodules, rb_ignore_rule, rb_update_rule;
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	if (rb_obj_is_kind_of(rb_name_or_submodule, rb_cRuggedSubmodule))
 		rb_name_or_submodule = rb_funcall(rb_name_or_submodule, rb_intern("name"), 0);

data/ext/rugged/rugged_tag.c

@@ -16,6 +16,8 @@ VALUE rb_cRuggedTag;
 VALUE rb_cRuggedTagAnnotation;
 
 extern const rb_data_type_t rugged_object_type;
+extern const rb_data_type_t rugged_reference_type;
+extern const rb_data_type_t rugged_repository_type;
 
 /*
  *  call-seq:
@@ -160,8 +162,8 @@ static VALUE rb_git_tag_annotation(VALUE self)
 	VALUE rb_repo = rugged_owner(self);
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(self, git_reference, ref);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	error = git_reference_resolve(&resolved_ref, ref);
 	rugged_exception_check(error);
@@ -188,8 +190,8 @@ static VALUE rb_git_tag_target(VALUE self)
 	VALUE rb_repo = rugged_owner(self);
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(self, git_reference, ref);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	error = git_reference_resolve(&resolved_ref, ref);
 	rugged_exception_check(error);

data/ext/rugged/rugged_tag_collection.c

@@ -13,6 +13,8 @@ extern VALUE rb_cRuggedTag;
 
 VALUE rb_cRuggedTagCollection;
 
+extern const rb_data_type_t rugged_repository_type;
+
 /*
  *  call-seq:
  *    TagCollection.new(repo) -> refs
@@ -42,7 +44,7 @@ static VALUE rb_git_tag_collection_aref(VALUE self, VALUE rb_name)
 	VALUE rb_repo = rugged_owner(self);
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	Check_Type(rb_name, T_STRING);
 
@@ -76,7 +78,7 @@ static VALUE rb_git_tag_collection_delete(VALUE self, VALUE rb_name)
 	int error;
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	Check_Type(rb_name, T_STRING);
 
@@ -116,7 +118,7 @@ static VALUE rb_git_tag_collection_create(int argc, VALUE *argv, VALUE self)
 	rb_scan_args(argc, argv, "21:", &rb_name, &rb_target, &rb_force, &rb_annotation);
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	Check_Type(rb_name, T_STRING);
 
@@ -194,7 +196,7 @@ static VALUE rb_git_tag_collection_create_annotation(VALUE self, VALUE rb_name,
 
 	VALUE rb_repo = rugged_owner(self);
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	Check_Type(rb_name, T_STRING);
 
@@ -245,7 +247,7 @@ static VALUE each_tag(int argc, VALUE *argv, VALUE self, int tag_names_only)
 	}
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	error = git_tag_list_match(&tags, pattern ? pattern : "", repo);
 	rugged_exception_check(error);

data/ext/rugged/rugged_tree.c

@@ -18,7 +18,9 @@ extern VALUE rb_cRuggedCommit;
 VALUE rb_cRuggedTree;
 VALUE rb_cRuggedTreeBuilder;
 
+extern const rb_data_type_t rugged_index_type;
 extern const rb_data_type_t rugged_object_type;
+extern const rb_data_type_t rugged_repository_type;
 
 static VALUE rb_git_treeentry_fromC(const git_tree_entry *entry)
 {
@@ -348,8 +350,8 @@ static VALUE rb_git_diff_tree_to_index(VALUE self, VALUE rb_repo, VALUE rb_self,
 	git_index *index;
 	int error;
 
-	Data_Get_Struct(rb_repo, git_repository, repo);
-	Data_Get_Struct(rb_other, git_index, index);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
+	TypedData_Get_Struct(rb_other, git_index, &rugged_index_type, index);
 
 	rugged_parse_diff_options(&opts, rb_options);
 
@@ -391,7 +393,7 @@ static VALUE rb_git_diff_tree_to_tree(VALUE self, VALUE rb_repo, VALUE rb_tree,
 	git_diff *diff = NULL;
 	struct nogvl_diff_args args;
 
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	if(RTEST(rb_tree))
 	    TypedData_Get_Struct(rb_tree, git_tree, &rugged_object_type, tree);
@@ -439,7 +441,7 @@ static VALUE rb_git_tree_diff_workdir(int argc, VALUE *argv, VALUE self)
 
 	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
 	owner = rugged_owner(self);
-	Data_Get_Struct(owner, git_repository, repo);
+	TypedData_Get_Struct(owner, git_repository, &rugged_repository_type, repo);
 
 	error = git_diff_tree_to_workdir(&diff, repo, tree, &opts);
 
@@ -561,7 +563,7 @@ static VALUE rb_git_tree_merge(int argc, VALUE *argv, VALUE self)
 		rb_raise(rb_eTypeError, "Expecting a Rugged::Tree instance");
 
 	TypedData_Get_Struct(self, git_tree, &rugged_object_type, tree);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 	TypedData_Get_Struct(rb_other_tree, git_tree, &rugged_object_type, other_tree);
 
 	if (!NIL_P(rb_ancestor_tree))
@@ -596,7 +598,7 @@ static VALUE rb_git_tree_empty(VALUE self, VALUE rb_repo)
 	git_tree *tree;
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	rugged_exception_check(git_tree_lookup(&tree, repo, &empty_tree));
 
@@ -708,11 +710,21 @@ static VALUE rb_git_tree_update(VALUE self, VALUE rb_updates)
 	return rugged_create_oid(&id);
 }
 
-static void rb_git_treebuilder_free(git_treebuilder *bld)
+static void rb_git_treebuilder__free(void *data)
 {
+	git_treebuilder *bld = (git_treebuilder *) data;
 	git_treebuilder_free(bld);
 }
 
+const rb_data_type_t rugged_treebuilder_type = {
+	.wrap_struct_name = "Rugged::Tree::Builder",
+	.function = {
+		.dfree = rb_git_treebuilder__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+
 /*
  *  call-seq:
  *    Tree::Builder.new(repository, [tree])
@@ -740,12 +752,12 @@ static VALUE rb_git_treebuilder_new(int argc, VALUE *argv, VALUE klass)
 	}
 
 	rugged_check_repo(rb_repo);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	error = git_treebuilder_new(&builder, repo, tree);
 	rugged_exception_check(error);
 
-	rb_builder = Data_Wrap_Struct(klass, NULL, &rb_git_treebuilder_free, builder);
+	rb_builder = TypedData_Wrap_Struct(klass, &rugged_treebuilder_type, builder);
 	rugged_set_owner(rb_builder, rb_repo);
 
 	return rb_builder;
@@ -760,7 +772,7 @@ static VALUE rb_git_treebuilder_new(int argc, VALUE *argv, VALUE klass)
 static VALUE rb_git_treebuilder_clear(VALUE self)
 {
 	git_treebuilder *builder;
-	Data_Get_Struct(self, git_treebuilder, builder);
+	TypedData_Get_Struct(self, git_treebuilder, &rugged_treebuilder_type, builder);
 	git_treebuilder_clear(builder);
 	return Qnil;
 }
@@ -774,7 +786,7 @@ static VALUE rb_git_treebuilder_clear(VALUE self)
 static VALUE rb_git_treebuilder_get(VALUE self, VALUE path)
 {
 	git_treebuilder *builder;
-	Data_Get_Struct(self, git_treebuilder, builder);
+	TypedData_Get_Struct(self, git_treebuilder, &rugged_treebuilder_type, builder);
 
 	Check_Type(path, T_STRING);
 
@@ -795,7 +807,7 @@ static VALUE rb_git_treebuilder_insert(VALUE self, VALUE rb_entry)
 	git_oid oid;
 	int error;
 
-	Data_Get_Struct(self, git_treebuilder, builder);
+	TypedData_Get_Struct(self, git_treebuilder, &rugged_treebuilder_type, builder);
 	Check_Type(rb_entry, T_HASH);
 
 	rb_path = rb_hash_aref(rb_entry, CSTR2SYM("name"));
@@ -832,7 +844,7 @@ static VALUE rb_git_treebuilder_remove(VALUE self, VALUE path)
 	git_treebuilder *builder;
 	int error;
 
-	Data_Get_Struct(self, git_treebuilder, builder);
+	TypedData_Get_Struct(self, git_treebuilder, &rugged_treebuilder_type, builder);
 	Check_Type(path, T_STRING);
 
 	error = git_treebuilder_remove(builder, StringValueCStr(path));
@@ -860,7 +872,7 @@ static VALUE rb_git_treebuilder_write(VALUE self)
 	git_oid written_id;
 	int error;
 
-	Data_Get_Struct(self, git_treebuilder, builder);
+	TypedData_Get_Struct(self, git_treebuilder, &rugged_treebuilder_type, builder);
 
 	error = git_treebuilder_write(&written_id, builder);
 	rugged_exception_check(error);
@@ -887,7 +899,7 @@ static VALUE rb_git_treebuilder_filter(VALUE self)
 	git_treebuilder *builder;
 
 	rb_need_block();
-	Data_Get_Struct(self, git_treebuilder, builder);
+	TypedData_Get_Struct(self, git_treebuilder, &rugged_treebuilder_type, builder);
 
 	git_treebuilder_filter(builder, &treebuilder_cb, (void *)rb_block_proc());
 	return Qnil;

data/lib/rugged/version.rb

@@ -4,5 +4,5 @@
 # For full terms see the included LICENSE file.
 
 module Rugged
-  Version = VERSION = '1.9.0'
+  Version = VERSION = '1.9.4'
 end

data/vendor/libgit2/AUTHORS

@@ -59,6 +59,7 @@ Romain Geissler
 Romain Muller
 Russell Belfer
 Sakari Jokinen
+Sam Altier
 Samuel Charles "Sam" Day
 Sarath Lakshman
 Sascha Cunz
@@ -70,6 +71,7 @@ Shawn O. Pearce
 Shuhei Tanuma
 Steve Frécinaux
 Sven Strickroth
+Talya "kivikakk" Connor
 Tim Branyen
 Tim Clem
 Tim Harder

data/vendor/libgit2/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 cmake_minimum_required(VERSION 3.5.1)
 
-project(libgit2 VERSION "1.9.0" LANGUAGES C)
+project(libgit2 VERSION "1.9.4" LANGUAGES C)
 
 # Add find modules to the path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")

data/vendor/libgit2/cmake/DefaultCFlags.cmake

@@ -13,6 +13,9 @@ if(MSVC)
 	# /Gd - explicitly set cdecl calling convention
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gd")
 
+	# Remove warnings about operands that use different enum types.
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd5287")
+
 	if(NOT (MSVC_VERSION LESS 1900))
 		# /guard:cf - Enable Control Flow Guard
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /guard:cf")
@@ -56,7 +59,7 @@ if(MSVC)
 	set(CMAKE_C_FLAGS_MINSIZEREL "/DNDEBUG /O1 /Oy /GL /Gy ${CRT_FLAG_RELEASE}")
 
 	# /IGNORE:4221 - Ignore empty compilation units
-	set(CMAKE_STATIC_LINKER_FLAGS "/IGNORE:4221")
+	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221")
 
 	# /DYNAMICBASE - Address space load randomization (ASLR)
 	# /NXCOMPAT - Data execution prevention (DEP)

data/vendor/libgit2/cmake/SelectSSH.cmake

@@ -6,7 +6,9 @@ if(USE_SSH STREQUAL "exec")
 elseif(USE_SSH STREQUAL ON OR USE_SSH STREQUAL "libssh2")
 	find_pkglibraries(LIBSSH2 libssh2)
 
-	if(NOT LIBSSH2_FOUND)
+	if(LIBSSH2_FOUND)
+		set(LIBSSH2_FOUND_PKGCONFIG 1)
+	else()
 		find_package(LibSSH2)
 		set(LIBSSH2_INCLUDE_DIRS ${LIBSSH2_INCLUDE_DIR})
 		get_filename_component(LIBSSH2_LIBRARY_DIRS "${LIBSSH2_LIBRARY}" DIRECTORY)
@@ -20,7 +22,11 @@ elseif(USE_SSH STREQUAL ON OR USE_SSH STREQUAL "libssh2")
 
 	list(APPEND LIBGIT2_SYSTEM_INCLUDES ${LIBSSH2_INCLUDE_DIRS})
 	list(APPEND LIBGIT2_SYSTEM_LIBS ${LIBSSH2_LIBRARIES})
-	list(APPEND LIBGIT2_PC_LIBS ${LIBSSH2_LDFLAGS})
+	if(LIBSSH2_FOUND_PKGCONFIG)
+		list(APPEND LIBGIT2_PC_REQUIRES "libssh2")
+	else()
+		list(APPEND LIBGIT2_PC_LIBS ${LIBSSH2_LDFLAGS})
+	endif()
 
 	check_library_exists("${LIBSSH2_LIBRARIES}" libssh2_userauth_publickey_frommemory "${LIBSSH2_LIBRARY_DIRS}" HAVE_LIBSSH2_MEMORY_CREDENTIALS)
 	if(HAVE_LIBSSH2_MEMORY_CREDENTIALS)
@@ -42,5 +48,5 @@ elseif(USE_SSH STREQUAL ON OR USE_SSH STREQUAL "libssh2")
 elseif(USE_SSH STREQUAL OFF OR USE_SSH STREQUAL "")
 	add_feature_info(SSH OFF "SSH transport support")
 else()
-	message(FATAL_ERROR "unknown SSH option: ${USE_HTTP_PARSER}")
+	message(FATAL_ERROR "unknown SSH option: ${USE_SSH}")
 endif()