Merge pull request #760 from libgit2/cmn/update-libgit2-master

Bump vendored libgit2 to 9275d84c583

Author: carlosmn

.travis.yml

@@ -38,6 +38,6 @@ git:
 before_install:
   - git submodule update --init
   - gem update --system
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./vendor/libgit2/script/install-deps-osx.sh; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./vendor/libgit2/ci/setup-osx.sh; fi
 
 script: script/travisbuild

ext/rugged/rugged.c

@@ -210,7 +210,7 @@ static VALUE rb_git_prettify_message(int argc, VALUE *argv, VALUE self)
 	if (!error)
 		result = rb_enc_str_new(message.ptr, message.size, rb_utf8_encoding());
 
-	git_buf_free(&message);
+	git_buf_dispose(&message);
 	rugged_exception_check(error);
 
 	return result;

ext/rugged/rugged_branch.c

@@ -63,7 +63,7 @@ static VALUE rb_git_branch__remote_name(VALUE rb_repo, const char *canonical_nam
 	if ((error = git_branch_remote_name(&remote_name, repo, canonical_name)) == GIT_OK)
 		result = rb_enc_str_new(remote_name.ptr, remote_name.size, rb_utf8_encoding());
 
-	git_buf_free(&remote_name);
+	git_buf_dispose(&remote_name);
 	rugged_exception_check(error);
 
 	return result;

ext/rugged/rugged_commit.c

@@ -649,7 +649,7 @@ static VALUE rb_git_commit_to_mbox(int argc, VALUE *argv, VALUE self)
 	cleanup:
 
 	xfree(opts.pathspec.strings);
-	git_buf_free(&email_patch);
+	git_buf_dispose(&email_patch);
 	rugged_exception_check(error);
 
 	return rb_email_patch;
@@ -678,7 +678,7 @@ static VALUE rb_git_commit_header_field(VALUE self, VALUE rb_field)
 	error = git_commit_header_field(&header_field, commit, StringValueCStr(rb_field));
 
 	if (error < 0) {
-		git_buf_free(&header_field);
+		git_buf_dispose(&header_field);
 		if (error == GIT_ENOTFOUND)
 			return Qnil;
 		rugged_exception_check(error);
@@ -689,7 +689,7 @@ static VALUE rb_git_commit_header_field(VALUE self, VALUE rb_field)
 		encoding = rb_enc_find(encoding_name);
 
 	rb_result = rb_enc_str_new(header_field.ptr, header_field.size, encoding);
-	git_buf_free(&header_field);
+	git_buf_dispose(&header_field);
 	return rb_result;
 }
 
@@ -741,8 +741,8 @@ static VALUE rb_git_commit_extract_signature(int argc, VALUE *argv, VALUE self)
 	field = NIL_P(rb_field) ? NULL : StringValueCStr(rb_field);
 	error = git_commit_extract_signature(&signature, &signed_data, repo, &commit_id, field);
 	if (error < 0) {
-		git_buf_free(&signature);
-		git_buf_free(&signed_data);
+		git_buf_dispose(&signature);
+		git_buf_dispose(&signed_data);
 	}
 
 	if (error == GIT_ENOTFOUND && giterr_last()->klass == GITERR_OBJECT ) {
@@ -754,8 +754,8 @@ static VALUE rb_git_commit_extract_signature(int argc, VALUE *argv, VALUE self)
 				     rb_str_new(signed_data.ptr, signed_data.size));
 	}
 
-	git_buf_free(&signature);
-	git_buf_free(&signed_data);
+	git_buf_dispose(&signature);
+	git_buf_dispose(&signed_data);
 
 	return ret;
 }
@@ -821,7 +821,7 @@ static VALUE rb_git_commit_create_to_s(VALUE self, VALUE rb_repo, VALUE rb_data)
 	rugged_exception_check(error);
 
 	ret = rb_str_new_utf8(buf.ptr);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	return ret;
 }

ext/rugged/rugged_config.c

@@ -89,7 +89,7 @@ static VALUE rb_git_config_get(VALUE self, VALUE rb_key)
 
 	rugged_exception_check(error);
 	rb_result = rb_str_new_utf8(buf.ptr);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	return rb_result;
 }

ext/rugged/rugged_note.c

@@ -340,7 +340,7 @@ static VALUE rb_git_note_default_ref_GET(VALUE self)
 
 	rb_result = rb_enc_str_new(ref_name.ptr, ref_name.size, rb_utf8_encoding());
 
-	git_buf_free(&ref_name);
+	git_buf_dispose(&ref_name);
 
 	return rb_result;
 }

ext/rugged/rugged_repo.c

@@ -1467,7 +1467,7 @@ static VALUE rb_git_repo_discover(int argc, VALUE *argv, VALUE klass)
 	rugged_exception_check(error);
 
 	error = git_repository_open(&repo, repository_path.ptr);
-	git_buf_free(&repository_path);
+	git_buf_dispose(&repository_path);
 
 	rugged_exception_check(error);
 

ext/rugged/rugged_settings.c

@@ -37,7 +37,7 @@ static VALUE get_search_path(int level)
 	rugged_exception_check(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, level, &buf));
 
 	ret = rb_str_new_utf8(buf.ptr);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	return ret;
 }