rugged 1.9.0 → 1.9.4

data/ext/rugged/rugged_reference_collection.c

@@ -13,6 +13,8 @@ extern VALUE rb_cRuggedReference;
 
 VALUE rb_cRuggedReferenceCollection;
 
+extern const rb_data_type_t rugged_repository_type;
+
 /*
  *  call-seq:
  *    ReferenceCollection.new(repo) -> refs
@@ -56,7 +58,7 @@ static VALUE rb_git_reference_collection_create(int argc, VALUE *argv, VALUE sel
 	rb_scan_args(argc, argv, "20:", &rb_name, &rb_target, &rb_options);
 
 	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);
 	Check_Type(rb_target, T_STRING);
 
@@ -95,7 +97,7 @@ static VALUE rb_git_reference_collection_aref(VALUE self, VALUE rb_name) {
 	git_reference *ref;
 	int error;
 
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	error = git_reference_lookup(&ref, repo, StringValueCStr(rb_name));
 
@@ -119,7 +121,7 @@ static VALUE rb_git_reference_collection__each(int argc, VALUE *argv, VALUE 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);
 
 	if (!NIL_P(rb_glob)) {
 		Check_Type(rb_glob, T_STRING);
@@ -210,7 +212,7 @@ static VALUE rb_git_reference_collection_exist_p(VALUE self, VALUE rb_name_or_re
 	if (TYPE(rb_name_or_ref) != T_STRING)
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Reference instance");
 
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	error = git_reference_lookup(&ref, repo, StringValueCStr(rb_name_or_ref));
 	git_reference_free(ref);
@@ -265,7 +267,7 @@ static VALUE rb_git_reference_collection_rename(int argc, VALUE *argv, VALUE sel
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Reference instance");
 
 	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 (!NIL_P(rb_options)) {
 		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
@@ -337,7 +339,7 @@ static VALUE rb_git_reference_collection_update(int argc, VALUE *argv, VALUE sel
 	}
 
 	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_reference_lookup(&ref, repo, StringValueCStr(rb_name_or_ref));
 	rugged_exception_check(error);
@@ -388,7 +390,7 @@ static VALUE rb_git_reference_collection_delete(VALUE self, VALUE rb_name_or_ref
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Reference instance");
 
 	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_reference_lookup(&ref, repo, StringValueCStr(rb_name_or_ref));
 	rugged_exception_check(error);

data/ext/rugged/rugged_remote.c

@@ -12,6 +12,8 @@ extern VALUE rb_cRuggedRepo;
 extern VALUE rb_eRuggedError;
 VALUE rb_cRuggedRemote;
 
+extern const rb_data_type_t rugged_repository_type;
+
 static int progress_cb(const char *str, int len, void *data)
 {
 	struct rugged_remote_cb_payload *payload = data;
@@ -243,16 +245,25 @@ static int parse_prune_type(VALUE rb_prune_type)
 	}
 }
 
-static void rb_git_remote__free(git_remote *remote)
+static void rb_git_remote__free(void *data)
 {
+	git_remote *remote = (git_remote *) data;
 	git_remote_free(remote);
 }
 
+const rb_data_type_t rugged_remote_type = {
+	.wrap_struct_name = "Rugged::Remote",
+	.function = {
+		.dfree = rb_git_remote__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rugged_remote_new(VALUE owner, git_remote *remote)
 {
 	VALUE rb_remote;
 
-	rb_remote = Data_Wrap_Struct(rb_cRuggedRemote, NULL, &rb_git_remote__free, remote);
+	rb_remote = TypedData_Wrap_Struct(rb_cRuggedRemote, &rugged_remote_type, remote);
 	rugged_set_owner(rb_remote, owner);
 	return rb_remote;
 }
@@ -326,7 +337,7 @@ static VALUE rb_git_remote_ls(int argc, VALUE *argv, VALUE self)
 	size_t heads_len, i;
 
 	RETURN_ENUMERATOR(self, argc, argv);
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 	rb_scan_args(argc, argv, ":", &rb_options);
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
@@ -365,7 +376,7 @@ static VALUE rb_git_remote_name(VALUE self)
 {
 	git_remote *remote;
 	const char * name;
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 
 	name = git_remote_name(remote);
 
@@ -383,7 +394,7 @@ static VALUE rb_git_remote_name(VALUE self)
 static VALUE rb_git_remote_url(VALUE self)
 {
 	git_remote *remote;
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 
 	return rb_str_new_utf8(git_remote_url(remote));
 }
@@ -402,7 +413,7 @@ static VALUE rb_git_remote_push_url(VALUE self)
 	git_remote *remote;
 	const char * push_url;
 
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 
 	push_url = git_remote_pushurl(remote);
 	return push_url ? rb_str_new_utf8(push_url) : Qnil;
@@ -424,10 +435,10 @@ static VALUE rb_git_remote_set_push_url(VALUE self, VALUE rb_url)
 	git_repository *repo;
 
 	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_url, T_STRING);
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 
 	rugged_exception_check(
 		git_remote_set_pushurl(repo, git_remote_name(remote), StringValueCStr(rb_url))
@@ -443,7 +454,7 @@ static VALUE rb_git_remote_refspecs(VALUE self, git_direction direction)
 	git_strarray refspecs;
 	VALUE rb_refspec_array;
 
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 
 	if (direction == GIT_DIRECTION_FETCH)
 		error = git_remote_get_fetch_refspecs(&refspecs, remote);
@@ -522,7 +533,7 @@ static VALUE rb_git_remote_check_connection(int argc, VALUE *argv, VALUE self)
 	ID id_direction;
 	int error, direction;
 
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 	rb_scan_args(argc, argv, "01:", &rb_direction, &rb_options);
 
 	Check_Type(rb_direction, T_SYMBOL);
@@ -625,7 +636,7 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 
 	rugged_rb_ary_to_strarray(rb_refspecs, &refspecs);
 
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &opts.callbacks, &payload);
 	rugged_remote_init_custom_headers(rb_options, &opts.custom_headers);
@@ -720,7 +731,7 @@ static VALUE rb_git_remote_push(int argc, VALUE *argv, VALUE self)
 
 	rugged_rb_ary_to_strarray(rb_refspecs, &refspecs);
 
-	Data_Get_Struct(self, git_remote, remote);
+	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &opts.callbacks, &payload);
 	rugged_remote_init_custom_headers(rb_options, &opts.custom_headers);

data/ext/rugged/rugged_remote_collection.c

@@ -13,6 +13,8 @@ extern VALUE rb_eRuggedError;
 extern VALUE rb_cRuggedRemote;
 VALUE rb_cRuggedRemoteCollection;
 
+extern const rb_data_type_t rugged_repository_type;
+
 /*
  *  call-seq:
  *    RemoteCollection.new(repo) -> remotes
@@ -45,7 +47,7 @@ static VALUE rb_git_remote_collection_create_anonymous(VALUE self, VALUE rb_url)
 	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_url, T_STRING);
 
@@ -80,7 +82,7 @@ static VALUE rb_git_remote_collection_create(VALUE self, VALUE rb_name, VALUE rb
 	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);
 	Check_Type(rb_url, T_STRING);
@@ -115,7 +117,7 @@ static VALUE rb_git_remote_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);
 
@@ -143,7 +145,7 @@ static VALUE rb_git_remote_collection__each(VALUE self, int only_names)
 
 	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);
 
 	error = git_remote_list(&remotes, repo);
 	rugged_exception_check(error);
@@ -244,7 +246,7 @@ static VALUE rb_git_remote_collection_rename(VALUE self, VALUE rb_name_or_remote
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Remote instance");
 
 	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_remote_rename(&problems, repo, StringValueCStr(rb_name_or_remote), StringValueCStr(rb_new_name));
 	rugged_exception_check(error);
@@ -283,7 +285,7 @@ static VALUE rb_git_remote_collection_delete(VALUE self, VALUE rb_name_or_remote
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Remote instance");
 
 	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_remote_delete(repo, StringValueCStr(rb_name_or_remote))
@@ -314,7 +316,7 @@ static VALUE rb_git_remote_collection_set_url(VALUE self, VALUE rb_name_or_remot
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Remote instance");
 
 	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_url, T_STRING);
 
@@ -347,7 +349,7 @@ static VALUE rb_git_remote_collection_set_push_url(VALUE self, VALUE rb_name_or_
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Remote instance");
 
 	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_url, T_STRING);
 
@@ -371,7 +373,7 @@ static VALUE rb_git_remote_collection_add_refspec(VALUE self, VALUE rb_name_or_r
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Remote instance");
 
 	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_refspec, T_STRING);
 

data/ext/rugged/rugged_repo.c

@@ -34,6 +34,10 @@ VALUE rb_cRuggedOdbObject;
 
 static ID id_call;
 
+extern const rb_data_type_t rugged_config_type;
+extern const rb_data_type_t rugged_diff_type;
+extern const rb_data_type_t rugged_index_type;
+const rb_data_type_t rugged_repository_type;
 extern const rb_data_type_t rugged_object_type;
 static const rb_data_type_t rugged_odb_object_type;
 
@@ -143,14 +147,23 @@ VALUE rugged_raw_read(git_repository *repo, const git_oid *oid)
 	return TypedData_Wrap_Struct(rb_cRuggedOdbObject, &rugged_odb_object_type, obj);
 }
 
-void rb_git_repo__free(git_repository *repo)
+void rb_git_repo__free(void *data)
 {
+	git_repository *repo = (git_repository *) data;
 	git_repository_free(repo);
 }
 
+const rb_data_type_t rugged_repository_type = {
+	.wrap_struct_name = "Rugged::Repository",
+	.function = {
+		.dfree = rb_git_repo__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rugged_repo_new(VALUE klass, git_repository *repo)
 {
-	VALUE rb_repo = Data_Wrap_Struct(klass, NULL, &rb_git_repo__free, repo);
+	VALUE rb_repo = TypedData_Wrap_Struct(klass, &rugged_repository_type, repo);
 
 #ifdef HAVE_RUBY_ENCODING_H
 	/* TODO: set this properly */
@@ -212,7 +225,9 @@ static void rugged_repo_new_with_backend(git_repository **repo, VALUE rb_path, V
 		rb_raise(rb_eRuggedError, "Backend must be an instance of Rugged::Backend");
 	}
 
-	Data_Get_Struct(rb_backend, rugged_backend, backend);
+	/* Backends are wrapped by external code with a type descriptor we don't
+	 * own, so we can't TypedData_Get_Struct against a known type. */
+	backend = (rugged_backend *)RTYPEDDATA_DATA(rb_backend);
 
 	error = git_odb_new(&odb);
 	if (error) goto cleanup;
@@ -613,7 +628,7 @@ static VALUE rb_git_repo_clone_at(int argc, VALUE *argv, VALUE klass)
 		git_repository *repo; \
 		git_##_object *data; \
 		int error; \
-		Data_Get_Struct(self, git_repository, repo); \
+		TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo); \
 		error = git_repository_##_object(&data, repo); \
 		rugged_exception_check(error); \
 		rb_data = rugged_##_object##_new(_klass, self, data); \
@@ -631,8 +646,8 @@ static VALUE rb_git_repo_clone_at(int argc, VALUE *argv, VALUE klass)
 	if (!NIL_P(rugged_owner(rb_data))) \
 		rb_raise(rb_eRuntimeError, \
 			"The given object is already owned by another repository"); \
-	Data_Get_Struct(self, git_repository, repo); \
-	Data_Get_Struct(rb_data, git_##_object, data); \
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo); \
+	TypedData_Get_Struct(rb_data, git_##_object, &rugged_##_object##_type, data);			\
 	git_repository_set_##_object(repo, data); \
 	rb_old_data = rb_iv_get(self, "@" #_object); \
 	if (!NIL_P(rb_old_data)) rugged_set_owner(rb_old_data, Qnil); \
@@ -712,7 +727,7 @@ static VALUE rb_git_repo_set_ident(VALUE self, VALUE rb_ident) {
 	git_repository *repo;
 	const char *name = NULL, *email = NULL;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	if (!NIL_P(rb_ident)) {
 		Check_Type(rb_ident, T_HASH);
@@ -750,7 +765,7 @@ static VALUE rb_git_repo_get_ident(VALUE self)
 	git_repository *repo;
 	const char *name = NULL, *email = NULL;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	rugged_exception_check(
 		git_repository_ident(&name, &email, repo)
@@ -786,7 +801,7 @@ static VALUE rb_git_repo_merge_base(VALUE self, VALUE rb_args)
 	if (len < 2)
 		rb_raise(rb_eArgError, "wrong number of arguments (%d for 2+)", len);
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	for (i = 0; !error && i < len; ++i) {
 		error = rugged_oid_get(&input_array[i], repo, rb_ary_entry(rb_args, i));
@@ -830,7 +845,7 @@ static VALUE rb_git_repo_merge_bases(VALUE self, VALUE rb_args)
 	if (len < 2)
 		rb_raise(rb_eArgError, "wrong number of arguments (%ld for 2+)", RARRAY_LEN(rb_args));
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	input_array = xmalloc(sizeof(git_oid) * len);
 
@@ -898,7 +913,7 @@ static VALUE rb_git_repo_merge_analysis(int argc, VALUE *argv, VALUE self)
 
 	rb_scan_args(argc, argv, "10", &rb_their_commit);
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	if (TYPE(rb_their_commit) == T_STRING) {
 		rb_their_commit = rugged_object_rev_parse(self, rb_their_commit, 1);
@@ -975,7 +990,7 @@ static VALUE rb_git_repo_revert_commit(int argc, VALUE *argv, VALUE self)
 		}
 	}
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	TypedData_Get_Struct(rb_revert_commit, git_commit, &rugged_object_type, revert_commit);
 	TypedData_Get_Struct(rb_our_commit, git_commit, &rugged_object_type, our_commit);
 
@@ -1024,7 +1039,7 @@ static VALUE rb_git_repo_apply(int argc, VALUE *argv, VALUE self)
 	struct rugged_apply_cb_payload payload = { Qnil, Qnil, 0 };
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	if (git_repository_is_bare(repo)) {
 		location = GIT_APPLY_LOCATION_INDEX;
 	} else {
@@ -1042,7 +1057,7 @@ static VALUE rb_git_repo_apply(int argc, VALUE *argv, VALUE self)
 		rugged_parse_apply_options(&opts, &location, rb_options, &payload);
 	}
 
-	Data_Get_Struct(rb_diff, git_diff, diff);
+	TypedData_Get_Struct(rb_diff, git_diff, &rugged_diff_type, diff);
 
 	error = git_apply(repo, diff, location, &opts);
 
@@ -1093,7 +1108,7 @@ static VALUE rb_git_repo_merge_commits(int argc, VALUE *argv, VALUE self)
 		rugged_parse_merge_options(&opts, rb_options);
 	}
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	TypedData_Get_Struct(rb_our_commit, git_commit, &rugged_object_type, our_commit);
 	TypedData_Get_Struct(rb_their_commit, git_commit, &rugged_object_type, their_commit);
 
@@ -1124,7 +1139,7 @@ static VALUE rb_git_repo_exists(VALUE self, VALUE hex)
 	git_oid oid;
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	Check_Type(hex, T_STRING);
 
 	error = git_oid_fromstrn(&oid, RSTRING_PTR(hex), RSTRING_LEN(hex));
@@ -1154,7 +1169,7 @@ static VALUE rb_git_repo_read(VALUE self, VALUE hex)
 	git_oid oid;
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	Check_Type(hex, T_STRING);
 
 	error = git_oid_fromstr(&oid, StringValueCStr(hex));
@@ -1188,7 +1203,7 @@ static VALUE rb_git_repo_read_header(VALUE self, VALUE hex)
 	VALUE rb_hash;
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	Check_Type(hex, T_STRING);
 
 	error = git_oid_fromstr(&oid, StringValueCStr(hex));
@@ -1233,7 +1248,7 @@ static VALUE rb_git_repo_expand_oids(int argc, VALUE *argv, VALUE self)
 	long i, expand_count;
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	rb_scan_args(argc, argv, "11", &rb_oids, &rb_expected_type);
 
 	Check_Type(rb_oids, T_ARRAY);
@@ -1303,7 +1318,7 @@ static VALUE rb_git_repo_descendant_of(VALUE self, VALUE rb_commit, VALUE rb_anc
 	git_repository *repo;
 	git_oid commit, ancestor;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	error = rugged_oid_get(&commit, repo, rb_commit);
 	rugged_exception_check(error);
@@ -1396,7 +1411,7 @@ static VALUE rb_git_repo_write(VALUE self, VALUE rb_buffer, VALUE rub_type)
 
 	git_otype type;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	Check_Type(rb_buffer, T_STRING);
 
 	error = git_repository_odb(&odb, repo);
@@ -1421,7 +1436,7 @@ static VALUE rb_git_repo_write(VALUE self, VALUE rb_buffer, VALUE rub_type)
 #define RB_GIT_REPO_GETTER(method) \
 	git_repository *repo; \
 	int error; \
-	Data_Get_Struct(self, git_repository, repo); \
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo); \
 	error = git_repository_##method(repo); \
 	rugged_exception_check(error); \
 	return error ? Qtrue : Qfalse; \
@@ -1497,7 +1512,7 @@ static VALUE rb_git_repo_set_head(VALUE self, VALUE rb_head)
 	git_repository *repo;
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	Check_Type(rb_head, T_STRING);
 	error = git_repository_set_head(repo, StringValueCStr(rb_head));
@@ -1520,7 +1535,7 @@ static VALUE rb_git_repo_get_head(VALUE self)
 	git_reference *head;
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	error = git_repository_head(&head, repo);
 	if (error == GIT_ENOTFOUND)
@@ -1545,7 +1560,7 @@ static VALUE rb_git_repo_path(VALUE self)
 	git_repository *repo;
 	const char *path;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	path = git_repository_path(repo);
 
 	return path ? rb_str_new_utf8(path) : Qnil;
@@ -1569,7 +1584,7 @@ static VALUE rb_git_repo_workdir(VALUE self)
 	git_repository *repo;
 	const char *workdir;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	workdir = git_repository_workdir(repo);
 
 	return workdir ? rb_str_new_utf8(workdir) : Qnil;
@@ -1595,7 +1610,7 @@ static VALUE rb_git_repo_set_workdir(VALUE self, VALUE rb_workdir)
 {
 	git_repository *repo;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	Check_Type(rb_workdir, T_STRING);
 
 	rugged_exception_check(
@@ -1691,7 +1706,7 @@ static VALUE rb_git_repo_file_status(VALUE self, VALUE rb_path)
 	int error;
 	git_repository *repo;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	FilePathValue(rb_path);
 	error = git_status_file(&flags, repo, StringValueCStr(rb_path));
 	rugged_exception_check(error);
@@ -1706,7 +1721,7 @@ static VALUE rb_git_repo_file_each_status(VALUE self)
 	git_repository *repo;
 	git_status_list *list;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	if (!rb_block_given_p())
 		rb_raise(rb_eRuntimeError,
@@ -1764,7 +1779,7 @@ static VALUE rb_git_repo_each_id(VALUE self)
 
 	RETURN_ENUMERATOR(self, 0, 0);
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	error = git_repository_odb(&odb, repo);
 	rugged_exception_check(error);
@@ -1828,7 +1843,7 @@ static VALUE rb_git_repo_reset(VALUE self, VALUE rb_target, VALUE rb_reset_type)
 	git_object *target = NULL;
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	reset_type = parse_reset_type(rb_reset_type);
 	target = rugged_object_get(repo, rb_target, GIT_OBJ_ANY);
@@ -1869,7 +1884,7 @@ static VALUE rb_git_repo_reset_path(int argc, VALUE *argv, VALUE self)
 	pathspecs.strings = NULL;
 	pathspecs.count = 0;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	rb_scan_args(argc, argv, "11", &rb_paths, &rb_target);
 
@@ -1901,7 +1916,7 @@ static VALUE rb_git_repo_reset_path(int argc, VALUE *argv, VALUE self)
 static VALUE rb_git_repo_close(VALUE self)
 {
 	git_repository *repo;
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	git_repository__cleanup(repo);
 
@@ -1920,7 +1935,7 @@ static VALUE rb_git_repo_set_namespace(VALUE self, VALUE rb_namespace)
 	git_repository *repo;
 	int error;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	if (!NIL_P(rb_namespace)) {
 		Check_Type(rb_namespace, T_STRING);
@@ -1944,7 +1959,7 @@ static VALUE rb_git_repo_get_namespace(VALUE self)
 	git_repository *repo;
 	const char *namespace;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	namespace = git_repository_get_namespace(repo);
 	return namespace ? rb_str_new_utf8(namespace) : Qnil;
@@ -1967,7 +1982,7 @@ static VALUE rb_git_repo_ahead_behind(VALUE self, VALUE rb_local, VALUE rb_upstr
 	size_t ahead, behind;
 	VALUE rb_result;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	error = rugged_oid_get(&local, repo, rb_local);
 	rugged_exception_check(error);
@@ -2006,7 +2021,7 @@ static VALUE rb_git_repo_default_signature(VALUE self) {
 	git_signature *signature;
 	VALUE rb_signature;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	error = git_signature_default(&signature, repo);
 
@@ -2372,7 +2387,7 @@ static VALUE rb_git_checkout_tree(int argc, VALUE *argv, VALUE self)
 		rb_raise(rb_eTypeError, "Expected Rugged::Commit, Rugged::Tag or Rugged::Tree");
 	}
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	TypedData_Get_Struct(rb_treeish, git_object, &rugged_object_type, treeish);
 
 	rugged_parse_checkout_options(&opts, rb_options);
@@ -2420,8 +2435,8 @@ static VALUE rb_git_checkout_index(int argc, VALUE *argv, VALUE self)
 	if (!rb_obj_is_kind_of(rb_index, rb_cRuggedIndex))
 		rb_raise(rb_eTypeError, "Expected Rugged::Index");
 
-	Data_Get_Struct(self, git_repository, repo);
-	Data_Get_Struct(rb_index, git_index, index);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
+	TypedData_Get_Struct(rb_index, git_index, &rugged_index_type, index);
 
 	rugged_parse_checkout_options(&opts, rb_options);
 
@@ -2464,7 +2479,7 @@ static VALUE rb_git_checkout_head(int argc, VALUE *argv, VALUE self)
 
 	rb_scan_args(argc, argv, "00:", &rb_options);
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	rugged_parse_checkout_options(&opts, rb_options);
 
@@ -2501,7 +2516,7 @@ static VALUE rb_git_repo_is_path_ignored(VALUE self, VALUE rb_path) {
 	int error;
 	int ignored;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	path = StringValueCStr(rb_path);
 	error = git_ignore_path_is_ignored(&ignored, repo, path);
 	rugged_exception_check(error);
@@ -2557,7 +2572,7 @@ static VALUE rb_git_repo_attributes(int argc, VALUE *argv, VALUE self)
 
 	rb_scan_args(argc, argv, "12", &rb_path, &rb_names, &rb_options);
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	FilePathValue(rb_path);
 
 	if (!NIL_P(rb_options)) {
@@ -2670,7 +2685,7 @@ static VALUE rb_git_repo_cherrypick(int argc, VALUE *argv, VALUE self)
 		rb_raise(rb_eArgError, "Expected a Rugged::Commit.");
 	}
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	TypedData_Get_Struct(rb_commit, git_commit, &rugged_object_type, commit);
 
 	rugged_parse_cherrypick_options(&opts, rb_options);
@@ -2723,7 +2738,7 @@ static VALUE rb_git_repo_cherrypick_commit(int argc, VALUE *argv, VALUE self)
 		rb_raise(rb_eArgError, "Expected a Rugged::Commit.");
 	}
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 	TypedData_Get_Struct(rb_commit, git_commit, &rugged_object_type, commit);
 	TypedData_Get_Struct(rb_our_commit, git_commit, &rugged_object_type, our_commit);