rugged 1.9.0 → 1.9.4

data/ext/rugged/rugged_index.c

@@ -14,6 +14,7 @@ extern VALUE rb_cRuggedDiff;
 extern VALUE rb_cRuggedTree;
 
 extern const rb_data_type_t rugged_object_type;
+extern const rb_data_type_t rugged_repository_type;
 
 static void rb_git_indexentry_toC(git_index_entry *entry, VALUE rb_entry);
 static VALUE rb_git_indexentry_fromC(const git_index_entry *entry);
@@ -22,14 +23,23 @@ static VALUE rb_git_indexentry_fromC(const git_index_entry *entry);
  * Index
  */
 
-static void rb_git_index__free(git_index *index)
+static void rb_git_index__free(void *data)
 {
+	git_index *index = (git_index *) data;
 	git_index_free(index);
 }
 
+const rb_data_type_t rugged_index_type = {
+	.wrap_struct_name = "Rugged::Index",
+	.function = {
+		.dfree = rb_git_index__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rugged_index_new(VALUE klass, VALUE owner, git_index *index)
 {
-	VALUE rb_index = Data_Wrap_Struct(klass, NULL, &rb_git_index__free, index);
+	VALUE rb_index = TypedData_Wrap_Struct(klass, &rugged_index_type, index);
 	rugged_set_owner(rb_index, owner);
 	return rb_index;
 }
@@ -72,7 +82,7 @@ static VALUE rb_git_index_new(int argc, VALUE *argv, VALUE klass)
 static VALUE rb_git_index_clear(VALUE self)
 {
 	git_index *index;
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 	git_index_clear(index);
 	return Qnil;
 }
@@ -89,7 +99,7 @@ static VALUE rb_git_index_read(VALUE self)
 	git_index *index;
 	int error;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	error = git_index_read(index, 0);
 	rugged_exception_check(error);
@@ -108,7 +118,7 @@ static VALUE rb_git_index_write(VALUE self)
 	git_index *index;
 	int error;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	error = git_index_write(index);
 	rugged_exception_check(error);
@@ -125,7 +135,7 @@ static VALUE rb_git_index_write(VALUE self)
 static VALUE rb_git_index_count(VALUE self)
 {
 	git_index *index;
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 	return INT2FIX(git_index_entrycount(index));
 }
 
@@ -148,7 +158,7 @@ static VALUE rb_git_index_get(int argc, VALUE *argv, VALUE self)
 
 	VALUE rb_entry, rb_stage;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	rb_scan_args(argc, argv, "11", &rb_entry, &rb_stage);
 
@@ -193,7 +203,7 @@ static VALUE rb_git_index_each(VALUE self)
 	unsigned int i, count;
 
 	RETURN_ENUMERATOR(self, 0, 0);
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	count = (unsigned int)git_index_entrycount(index);
 	for (i = 0; i < count; ++i) {
@@ -219,7 +229,7 @@ static VALUE rb_git_index_remove(int argc, VALUE *argv, VALUE self)
 
 	VALUE rb_entry, rb_stage;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	if (rb_scan_args(argc, argv, "11", &rb_entry, &rb_stage) > 1) {
 		Check_Type(rb_stage, T_FIXNUM);
@@ -248,7 +258,7 @@ static VALUE rb_git_index_remove_directory(int argc, VALUE *argv, VALUE self)
 
 	VALUE rb_dir, rb_stage;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	if (rb_scan_args(argc, argv, "11", &rb_dir, &rb_stage) > 1) {
 		Check_Type(rb_stage, T_FIXNUM);
@@ -292,7 +302,7 @@ static VALUE rb_git_index_add(VALUE self, VALUE rb_entry)
 	git_index *index;
 	int error = 0;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	if (TYPE(rb_entry) == T_HASH) {
 		git_index_entry entry;
@@ -378,7 +388,7 @@ static VALUE rb_git_index_add_all(int argc, VALUE *argv, VALUE self)
 	int error, exception = 0;
 	unsigned int flags = GIT_INDEX_ADD_DEFAULT;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	if (rb_scan_args(argc, argv, "02", &rb_pathspecs, &rb_options) > 1) {
 		Check_Type(rb_options, T_HASH);
@@ -439,7 +449,7 @@ static VALUE rb_git_index_update_all(int argc, VALUE *argv, VALUE self)
 	git_strarray pathspecs;
 	int error, exception = 0;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	rb_scan_args(argc, argv, "01", &rb_pathspecs);
 
@@ -482,7 +492,7 @@ static VALUE rb_git_index_remove_all(int argc, VALUE *argv, VALUE self)
 	git_strarray pathspecs;
 	int error, exception = 0;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	rb_scan_args(argc, argv, "01", &rb_pathspecs);
 
@@ -628,12 +638,12 @@ static VALUE rb_git_index_writetree(int argc, VALUE *argv, VALUE self)
 	int error;
 	VALUE rb_repo;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	if (rb_scan_args(argc, argv, "01", &rb_repo) == 1) {
 		git_repository *repo = NULL;
 		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_index_write_tree_to(&tree_oid, index, repo);
 	}
 	else {
@@ -659,7 +669,7 @@ static VALUE rb_git_index_readtree(VALUE self, VALUE rb_tree)
 	git_tree *tree;
 	int error;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 	TypedData_Get_Struct(rb_tree, git_tree, &rugged_object_type, tree);
 
 	if (!rb_obj_is_kind_of(rb_tree, rb_cRuggedTree)) {
@@ -684,9 +694,9 @@ static VALUE rb_git_diff_tree_to_index(VALUE self, VALUE rb_other, VALUE rb_opti
 
 	rugged_parse_diff_options(&opts, rb_options);
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 	owner = rugged_owner(self);
-	Data_Get_Struct(owner, git_repository, repo);
+	TypedData_Get_Struct(owner, git_repository, &rugged_repository_type, repo);
 
 	// Need to flip the reverse option, so that the index is by default
 	// the "old file" side of the diff.
@@ -712,9 +722,9 @@ static VALUE rb_git_diff_index_to_workdir(VALUE self, VALUE rb_options)
 
 	rugged_parse_diff_options(&opts, rb_options);
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 	owner = rugged_owner(self);
-	Data_Get_Struct(owner, git_repository, repo);
+	TypedData_Get_Struct(owner, git_repository, &rugged_repository_type, repo);
 
 	error = git_diff_index_to_workdir(&diff, repo, index, &opts);
 
@@ -733,7 +743,7 @@ static VALUE rb_git_diff_index_to_workdir(VALUE self, VALUE rb_options)
 static VALUE rb_git_index_conflicts_p(VALUE self)
 {
 	git_index *index;
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 	return git_index_has_conflicts(index) ? Qtrue : Qfalse;
 }
 
@@ -770,7 +780,7 @@ static VALUE rb_git_conflict_add(VALUE self, VALUE rb_conflict)
 	if (!NIL_P(rb_theirs))
 		rb_git_indexentry_toC(&theirs, rb_theirs);
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	error = git_index_conflict_add(index,
 		NIL_P(rb_ancestor) ? NULL : &ancestor,
@@ -794,7 +804,7 @@ static VALUE rb_git_conflict_remove(VALUE self, VALUE rb_path)
 
 	Check_Type(rb_path, T_STRING);
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	error = git_index_conflict_remove(index, StringValueCStr(rb_path));
 	rugged_exception_check(error);
@@ -823,7 +833,7 @@ static VALUE rb_git_conflict_get(VALUE self, VALUE rb_path)
 
 	Check_Type(rb_path, T_STRING);
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	error = git_index_conflict_get(&ancestor, &ours, &theirs, index, StringValueCStr(rb_path));
 	if (error == GIT_ENOTFOUND)
@@ -894,10 +904,10 @@ static VALUE rb_git_merge_file(int argc, VALUE *argv, VALUE self)
 
 	Check_Type(rb_path, T_STRING);
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	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_index_conflict_get(&ancestor, &ours, &theirs, index, StringValueCStr(rb_path));
 	if (error == GIT_ENOTFOUND)
@@ -930,7 +940,7 @@ static VALUE rb_git_conflict_cleanup(VALUE self)
 {
 	git_index *index;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 	git_index_conflict_cleanup(index);
 
 	return Qnil;
@@ -956,7 +966,7 @@ static VALUE rb_git_index_conflicts(VALUE self)
 	const git_index_entry *ancestor, *ours, *theirs;
 	int error;
 
-	Data_Get_Struct(self, git_index, index);
+	TypedData_Get_Struct(self, git_index, &rugged_index_type, index);
 
 	error = git_index_conflict_iterator_new(&iter, index);
 	rugged_exception_check(error);

data/ext/rugged/rugged_note.c

@@ -11,6 +11,7 @@ extern VALUE rb_cRuggedRepo;
 extern VALUE rb_cRuggedObject;
 
 extern const rb_data_type_t rugged_object_type;
+extern const rb_data_type_t rugged_repository_type;
 
 static VALUE rugged_git_note_message(const git_note *note)
 {
@@ -64,7 +65,7 @@ static VALUE rb_git_note_lookup(int argc, VALUE *argv, VALUE self)
 	TypedData_Get_Struct(self, git_object, &rugged_object_type, object);
 
 	owner = rugged_owner(self);
-	Data_Get_Struct(owner, git_repository, repo);
+	TypedData_Get_Struct(owner, git_repository, &rugged_repository_type, repo);
 
 	error = git_note_read(&note, repo, notes_ref, git_object_id(object));
 
@@ -129,7 +130,7 @@ static VALUE rb_git_note_create(VALUE self, VALUE rb_data)
 	TypedData_Get_Struct(self, git_object, &rugged_object_type, target);
 
 	owner = rugged_owner(self);
-	Data_Get_Struct(owner, git_repository, repo);
+	TypedData_Get_Struct(owner, git_repository, &rugged_repository_type, repo);
 
 	rb_ref = rb_hash_aref(rb_data, CSTR2SYM("ref"));
 
@@ -212,7 +213,7 @@ static VALUE rb_git_note_remove(int argc, VALUE *argv, VALUE self)
 	TypedData_Get_Struct(self, git_object, &rugged_object_type, target);
 
 	owner = rugged_owner(self);
-	Data_Get_Struct(owner, git_repository, repo);
+	TypedData_Get_Struct(owner, git_repository, &rugged_repository_type, repo);
 
 	rb_scan_args(argc, argv, "01", &rb_data);
 
@@ -259,7 +260,7 @@ static int cb_note__each(const git_oid *blob_id, const git_oid *annotated_object
 
 	git_repository *repo;
 
-	Data_Get_Struct(payload->rb_data, git_repository, repo);
+	TypedData_Get_Struct(payload->rb_data, git_repository, &rugged_repository_type, repo);
 
 	rugged_exception_check(
 		git_object_lookup(&annotated_object, repo, annotated_object_id, GIT_OBJ_ANY)
@@ -307,7 +308,7 @@ static VALUE rb_git_note_each(int argc, VALUE *argv, VALUE self)
 		notes_ref = StringValueCStr(rb_notes_ref);
 	}
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	error = git_note_foreach(repo, notes_ref, &cb_note__each, &payload);
 
@@ -334,7 +335,7 @@ static VALUE rb_git_note_default_ref_GET(VALUE self)
 	git_buf ref_name = { 0 };
 	VALUE rb_result;
 
-	Data_Get_Struct(self, git_repository, repo);
+	TypedData_Get_Struct(self, git_repository, &rugged_repository_type, repo);
 
 	rugged_exception_check(
 		git_note_default_ref(&ref_name, repo)

data/ext/rugged/rugged_object.c

@@ -17,6 +17,7 @@ extern VALUE rb_cRuggedRepo;
 VALUE rb_cRuggedObject;
 
 const rb_data_type_t rugged_object_type;
+extern const rb_data_type_t rugged_repository_type;
 
 git_otype rugged_otype_get(VALUE self)
 {
@@ -267,7 +268,7 @@ VALUE rb_git_object_lookup(VALUE klass, VALUE rb_repo, VALUE rb_hex)
 	if (oid_length > GIT_OID_HEXSZ)
 		rb_raise(rb_eTypeError, "The given OID is too long");
 
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	error = git_oid_fromstrn(&oid, RSTRING_PTR(rb_hex), oid_length);
 	rugged_exception_check(error);
@@ -295,7 +296,7 @@ VALUE rugged_object_rev_parse(VALUE rb_repo, VALUE rb_spec, int as_obj)
 
 	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_revparse_single(&object, repo, spec);
 	rugged_exception_check(error);

data/ext/rugged/rugged_patch.c

@@ -69,9 +69,23 @@ VALUE rb_git_patch_from_strings(int argc, VALUE *argv, VALUE self)
 	return rugged_patch_new(self, patch);
 }
 
+static void rb_git_patch__free(void *data)
+{
+	git_patch *patch = (git_patch *) data;
+	git_patch_free(patch);
+}
+
+const rb_data_type_t rugged_patch_type = {
+	.wrap_struct_name = "Rugged::Patch",
+	.function = {
+		.dfree = rb_git_patch__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rugged_patch_new(VALUE owner, git_patch *patch)
 {
-	VALUE rb_patch = Data_Wrap_Struct(rb_cRuggedPatch, NULL, &git_patch_free, patch);
+	VALUE rb_patch = TypedData_Wrap_Struct(rb_cRuggedPatch, &rugged_patch_type, patch);
 	rugged_set_owner(rb_patch, owner);
 	return rb_patch;
 }
@@ -94,7 +108,7 @@ static VALUE rb_git_diff_patch_each_hunk(VALUE self)
 	size_t hunks_count, h;
 
 	RETURN_ENUMERATOR(self, 0, 0);
-	Data_Get_Struct(self, git_patch, patch);
+	TypedData_Get_Struct(self, git_patch, &rugged_patch_type, patch);
 
 	hunks_count = git_patch_num_hunks(patch);
 	for (h = 0; h < hunks_count; ++h) {
@@ -117,7 +131,7 @@ static VALUE rb_git_diff_patch_each_hunk(VALUE self)
 static VALUE rb_git_diff_patch_hunk_count(VALUE self)
 {
 	git_patch *patch;
-	Data_Get_Struct(self, git_patch, patch);
+	TypedData_Get_Struct(self, git_patch, &rugged_patch_type, patch);
 
 	return INT2FIX(git_patch_num_hunks(patch));
 }
@@ -131,7 +145,7 @@ static VALUE rb_git_diff_patch_hunk_count(VALUE self)
 static VALUE rb_git_diff_patch_delta(VALUE self)
 {
 	git_patch *patch;
-	Data_Get_Struct(self, git_patch, patch);
+	TypedData_Get_Struct(self, git_patch, &rugged_patch_type, patch);
 
 	return rugged_diff_delta_new(rugged_owner(self), git_patch_get_delta(patch));
 }
@@ -146,7 +160,7 @@ static VALUE rb_git_diff_patch_stat(VALUE self)
 {
 	git_patch *patch;
 	size_t additions, deletions;
-	Data_Get_Struct(self, git_patch, patch);
+	TypedData_Get_Struct(self, git_patch, &rugged_patch_type, patch);
 
 	git_patch_line_stats(NULL, &additions, &deletions, patch);
 
@@ -191,7 +205,7 @@ static VALUE rb_git_diff_patch_lines(int argc, VALUE *argv, VALUE self)
 	size_t lines = 0;
 	int options = 0;
 	VALUE rb_options;
-	Data_Get_Struct(self, git_patch, patch);
+	TypedData_Get_Struct(self, git_patch, &rugged_patch_type, patch);
 
 	rb_scan_args(argc, argv, "0:", &rb_options);
 	if (!NIL_P(rb_options)) {
@@ -282,7 +296,7 @@ static VALUE rb_git_diff_patch_bytesize(int argc, VALUE *argv, VALUE self)
 	size_t bytesize;
 	VALUE rb_options;
 	int include_context, include_hunk_headers, include_file_headers;
-	Data_Get_Struct(self, git_patch, patch);
+	TypedData_Get_Struct(self, git_patch, &rugged_patch_type, patch);
 
 	include_context = include_hunk_headers = include_file_headers = 1;
 
@@ -352,7 +366,7 @@ static VALUE rb_git_diff_patch_to_s(VALUE self)
 {
 	git_patch *patch;
 	VALUE rb_buffer = rb_ary_new();
-	Data_Get_Struct(self, git_patch, patch);
+	TypedData_Get_Struct(self, git_patch, &rugged_patch_type, patch);
 
 	rugged_exception_check(git_patch_print(patch, patch_print_cb, (void*)rb_buffer));
 
@@ -370,7 +384,7 @@ static VALUE rb_git_diff_patch_header(VALUE self)
 	git_patch *patch;
 	int error = 0;
 	VALUE rb_buffer = rb_ary_new();
-	Data_Get_Struct(self, git_patch, patch);
+	TypedData_Get_Struct(self, git_patch, &rugged_patch_type, patch);
 
 	error = git_patch_print(patch, patch_print_header_cb, (void*)rb_buffer);
 	if (error && error != GIT_ITEROVER)

data/ext/rugged/rugged_rebase.c

@@ -16,6 +16,8 @@ extern VALUE rb_cRuggedReference;
 VALUE rb_cRuggedRebase;
 
 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;
 
 static VALUE rebase_operation_type(git_rebase_operation *operation);
 
@@ -42,14 +44,24 @@ static void parse_rebase_options(git_rebase_options *ret, VALUE rb_options)
 	rugged_parse_merge_options(&ret->merge_options, rb_options);
 }
 
-void rb_git_rebase__free(git_rebase *rebase)
+static void rb_git_rebase__free(void *data)
 {
+	git_rebase *rebase = (git_rebase *) data;
 	git_rebase_free(rebase);
 }
 
+const rb_data_type_t rugged_rebase_type = {
+	.wrap_struct_name = "Rugged::Rebase",
+	.function = {
+		.dfree = rb_git_rebase__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+
 VALUE rugged_rebase_new(VALUE klass, VALUE owner, git_rebase *rebase)
 {
-	VALUE rb_rebase = Data_Wrap_Struct(klass, NULL, &rb_git_rebase__free, rebase);
+	VALUE rb_rebase = TypedData_Wrap_Struct(klass, &rugged_rebase_type, rebase);
 	rugged_set_owner(rb_rebase, owner);
 	return rb_rebase;
 }
@@ -66,7 +78,7 @@ static void get_annotated_commit(git_annotated_commit **annotated_commit, VALUE
 	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);
 
 	if (rb_obj_is_kind_of(rb_value, rb_cRuggedCommit)) {
 		const git_commit * commit;
@@ -79,7 +91,7 @@ static void get_annotated_commit(git_annotated_commit **annotated_commit, VALUE
 	} else if (rb_obj_is_kind_of(rb_value, rb_cRuggedReference)) {
 		const git_reference * ref;
 
-		Data_Get_Struct(rb_value, git_reference, ref);
+		TypedData_Get_Struct(rb_value, git_reference, &rugged_reference_type, ref);
 
 		error = git_annotated_commit_from_ref(annotated_commit, repo, ref);
 	} else if (TYPE(rb_value) == T_STRING) {
@@ -152,7 +164,7 @@ static VALUE rb_git_rebase_new(int argc, VALUE* argv, VALUE klass)
 	git_rebase_options options = GIT_REBASE_OPTIONS_INIT;
 
 	rb_scan_args(argc, argv, "31:", &rb_repo, &rb_branch, &rb_upstream, &rb_onto, &rb_options);
-	Data_Get_Struct(rb_repo, git_repository, repo);
+	TypedData_Get_Struct(rb_repo, git_repository, &rugged_repository_type, repo);
 
 	if ((exception = rugged_get_annotated_commit(&branch, rb_repo, rb_branch)))
 		goto cleanup;
@@ -209,7 +221,7 @@ static VALUE rb_git_rebase_next(VALUE self)
 	git_rebase_operation *operation;
 	VALUE hash, val;
 
-	Data_Get_Struct(self, git_rebase, rebase);
+	TypedData_Get_Struct(self, git_rebase, &rugged_rebase_type, rebase);
 	error = git_rebase_next(&operation, rebase);
 	if (error == GIT_ITEROVER)
 		return Qnil;
@@ -252,7 +264,7 @@ static VALUE rb_git_rebase_inmemory_index(VALUE self)
 	git_rebase *rebase;
 	git_index *index;
 
-	Data_Get_Struct(self, git_rebase, rebase);
+	TypedData_Get_Struct(self, git_rebase, &rugged_rebase_type, rebase);
 	rugged_exception_check(git_rebase_inmemory_index(&index, rebase));
 
 	return rugged_index_new(rb_cRuggedIndex, self, index);
@@ -279,7 +291,7 @@ static VALUE rb_git_rebase_commit(int argc, VALUE *argv, VALUE self)
 	const char *message = NULL;
 	VALUE rb_options, rb_author, rb_committer, rb_message;
 
-	Data_Get_Struct(self, git_rebase, rebase);
+	TypedData_Get_Struct(self, git_rebase, &rugged_rebase_type, rebase);
 	rb_scan_args(argc, argv, ":", &rb_options);
 
 	Check_Type(rb_options, T_HASH);
@@ -326,7 +338,7 @@ static VALUE rb_git_rebase_abort(VALUE self)
 {
 	git_rebase *rebase;
 
-	Data_Get_Struct(self, git_rebase, rebase);
+	TypedData_Get_Struct(self, git_rebase, &rugged_rebase_type, rebase);
 	rugged_exception_check(git_rebase_abort(rebase));
 
 	return Qnil;
@@ -345,7 +357,7 @@ static VALUE rb_git_rebase_finish(VALUE self, VALUE rb_sig)
 	git_signature *sig;
 	int error;
 
-	Data_Get_Struct(self, git_rebase, rebase);
+	TypedData_Get_Struct(self, git_rebase, &rugged_rebase_type, rebase);
 	sig = rugged_signature_get(rb_sig, NULL);
 	error = git_rebase_finish(rebase, sig);
 	git_signature_free(sig);

data/ext/rugged/rugged_reference.c

@@ -12,14 +12,23 @@ extern VALUE rb_cRuggedRepo;
 
 VALUE rb_cRuggedReference;
 
-void rb_git_ref__free(git_reference *ref)
+void rb_git_ref__free(void *data)
 {
+	git_reference *ref = (git_reference *) data;
 	git_reference_free(ref);
 }
 
+const rb_data_type_t rugged_reference_type = {
+	.wrap_struct_name = "Rugged::Reference",
+	.function = {
+		.dfree = rb_git_ref__free,
+	},
+	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rugged_ref_new(VALUE klass, VALUE owner, git_reference *ref)
 {
-	VALUE rb_ref = Data_Wrap_Struct(klass, NULL, &rb_git_ref__free, ref);
+	VALUE rb_ref = TypedData_Wrap_Struct(klass, &rugged_reference_type, ref);
 	rugged_set_owner(rb_ref, owner);
 	return rb_ref;
 }
@@ -73,7 +82,7 @@ static VALUE rb_git_ref_peel(VALUE self)
 	char oid[GIT_OID_HEXSZ + 1];
 	int error;
 
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 
 	error = git_reference_peel(&object, ref, GIT_OBJ_ANY);
 	if (error == GIT_ENOTFOUND)
@@ -114,7 +123,7 @@ static VALUE rb_git_ref_target(VALUE self)
 {
 	git_reference *ref;
 
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 
 	if (git_reference_type(ref) == GIT_REF_OID) {
 		git_object *target;
@@ -155,7 +164,7 @@ static VALUE rb_git_ref_target(VALUE self)
 static VALUE rb_git_ref_target_id(VALUE self)
 {
 	git_reference *ref;
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 
 	if (git_reference_type(ref) == GIT_REF_OID) {
 		return rugged_create_oid(git_reference_target(ref));
@@ -173,7 +182,7 @@ static VALUE rb_git_ref_target_id(VALUE self)
 static VALUE rb_git_ref_type(VALUE self)
 {
 	git_reference *ref;
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 
 	switch (git_reference_type(ref)) {
 		case GIT_REF_OID:
@@ -201,7 +210,7 @@ static VALUE rb_git_ref_type(VALUE self)
 static VALUE rb_git_ref_name(VALUE self)
 {
 	git_reference *ref;
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 	return rb_str_new_utf8(git_reference_name(ref));
 }
 
@@ -224,7 +233,7 @@ static VALUE rb_git_ref_resolve(VALUE self)
 	git_reference *resolved;
 	int error;
 
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 
 	error = git_reference_resolve(&resolved, ref);
 	rugged_exception_check(error);
@@ -290,7 +299,7 @@ static VALUE rb_git_reflog(VALUE self)
 	VALUE rb_log;
 	size_t i, ref_count;
 
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 
 	error = git_reflog_read(&reflog, git_reference_owner(ref), git_reference_name(ref));
 	rugged_exception_check(error);
@@ -320,7 +329,7 @@ static VALUE rb_git_has_reflog(VALUE self)
 	git_reference *ref;
 	git_repository *repo;
 
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 	repo = git_reference_owner(ref);
 
 	return git_reference_has_log(repo, git_reference_name(ref)) ? Qtrue : Qfalse;
@@ -335,7 +344,7 @@ static VALUE rb_git_has_reflog(VALUE self)
 static VALUE rb_git_ref_is_branch(VALUE self)
 {
 	git_reference *ref;
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 	return git_reference_is_branch(ref) ? Qtrue : Qfalse;
 }
 
@@ -348,7 +357,7 @@ static VALUE rb_git_ref_is_branch(VALUE self)
 static VALUE rb_git_ref_is_remote(VALUE self)
 {
 	git_reference *ref;
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 	return git_reference_is_remote(ref) ? Qtrue : Qfalse;
 }
 
@@ -361,7 +370,7 @@ static VALUE rb_git_ref_is_remote(VALUE self)
 static VALUE rb_git_ref_is_tag(VALUE self)
 {
 	git_reference *ref;
-	Data_Get_Struct(self, git_reference, ref);
+	TypedData_Get_Struct(self, git_reference, &rugged_reference_type, ref);
 	return git_reference_is_tag(ref) ? Qtrue : Qfalse;
 }