Merge pull request #470 from libgit2/arthur/libgit2

Update to latest libgit2

Author: Vicent Marti

ext/rugged/rugged_branch_collection.c

@@ -120,12 +120,6 @@ static git_branch_t parse_branch_type(VALUE rb_filter)
  *    Overwrites the branch with the given +name+, if it already exists,
  *    instead of raising an exception.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog.
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entry.
- *
  *  If a branch with the given +name+ already exists and +:force+ is not +true+,
  *  an exception will be raised.
  *
@@ -137,8 +131,6 @@ static VALUE rb_git_branch_collection_create(int argc, VALUE *argv, VALUE self)
 	git_repository *repo;
 	git_reference *branch;
 	git_commit *target;
-	git_signature *signature = NULL;
-	char *log_message = NULL;
 	int error, force = 0;
 
 	rb_scan_args(argc, argv, "20:", &rb_name, &rb_target, &rb_options);
@@ -150,25 +142,14 @@ static VALUE rb_git_branch_collection_create(int argc, VALUE *argv, VALUE self)
 	Check_Type(rb_target, T_STRING);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
 		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
-		if (!NIL_P(rb_val))
-			log_message = StringValueCStr(rb_val);
 	}
 
 	target = (git_commit *)rugged_object_get(repo, rb_target, GIT_OBJ_COMMIT);
 
-	error = git_branch_create(&branch, repo, StringValueCStr(rb_name), target, force, signature, log_message);
+	error = git_branch_create(&branch, repo, StringValueCStr(rb_name), target, force);
 
 	git_commit_free(target);
-	git_signature_free(signature);
 
 	rugged_exception_check(error);
 
@@ -342,12 +323,6 @@ static VALUE rb_git_branch_collection_delete(VALUE self, VALUE rb_name_or_branch
  *    Overwrites the branch with the given +name+, if it already exists,
  *    instead of raising an exception.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog.
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entry.
- *
  *  If a branch with the given +new_name+ already exists and +:force+ is not +true+,
  *  an exception will be raised.
  *
@@ -359,36 +334,23 @@ static VALUE rb_git_branch_collection_move(int argc, VALUE *argv, VALUE self)
 	VALUE rb_repo = rugged_owner(self), rb_name_or_branch, rb_new_branch_name, rb_options;
 	git_reference *old_branch = NULL, *new_branch = NULL;
 	git_repository *repo;
-	git_signature *signature = NULL;
-	char *log_message = NULL;
 	int error, force = 0;
 
 	rb_scan_args(argc, argv, "20:", &rb_name_or_branch, &rb_new_branch_name, &rb_options);
 	Check_Type(rb_new_branch_name, T_STRING);
 
 	rugged_check_repo(rb_repo);
 	Data_Get_Struct(rb_repo, git_repository, repo);
-	
+
 	error = rugged_branch_lookup(&old_branch, repo, rb_name_or_branch);
 	rugged_exception_check(error);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
 		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
-		if (!NIL_P(rb_val))
-			log_message = StringValueCStr(rb_val);
 	}
 
-	error = git_branch_move(&new_branch, old_branch, StringValueCStr(rb_new_branch_name), force, signature, log_message);
+	error = git_branch_move(&new_branch, old_branch, StringValueCStr(rb_new_branch_name), force);
 
-	git_signature_free(signature);
 	git_reference_free(old_branch);
 
 	rugged_exception_check(error);

ext/rugged/rugged_config.c

@@ -87,18 +87,22 @@ static VALUE rb_git_config_new(VALUE klass, VALUE rb_path)
 static VALUE rb_git_config_get(VALUE self, VALUE rb_key)
 {
 	git_config *config;
-	const char *value;
+	git_buf buf = { NULL };
 	int error;
+	VALUE rb_result;
 
 	Data_Get_Struct(self, git_config, config);
 	Check_Type(rb_key, T_STRING);
 
-	error = git_config_get_string(&value, config, StringValueCStr(rb_key));
+	error = git_config_get_string_buf(&buf, config, StringValueCStr(rb_key));
 	if (error == GIT_ENOTFOUND)
 		return Qnil;
 
 	rugged_exception_check(error);
-	return rb_str_new_utf8(value);
+	rb_result = rb_str_new_utf8(buf.ptr);
+	git_buf_free(&buf);
+
+	return rb_result;
 }
 
 /*

ext/rugged/rugged_reference_collection.c

@@ -58,26 +58,15 @@ static VALUE rb_git_reference_collection_initialize(VALUE self, VALUE repo)
  *    Overwrites the reference with the given +name+, if it already exists,
  *    instead of raising an exception.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog.
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entry.
- *
  *  If a reference with the given +name+ already exists and +:force+ is not +true+,
  *  an exception will be raised.
- *
- *  The +:message+ and +:signature+ options are ignored if the reference does not
- *  belong to the standard set (+HEAD+, +refs/heads/*+, +refs/remotes/*+ or +refs/notes/*+)
- *  and it does not have a reflog.
  */
 static VALUE rb_git_reference_collection_create(int argc, VALUE *argv, VALUE self)
 {
 	VALUE rb_repo = rugged_owner(self), rb_name, rb_target, rb_options;
 	git_repository *repo;
 	git_reference *ref;
 	git_oid oid;
-	git_signature *signature = NULL;
 	char *log_message = NULL;
 	int error, force = 0;
 
@@ -89,28 +78,21 @@ static VALUE rb_git_reference_collection_create(int argc, VALUE *argv, VALUE sel
 	Check_Type(rb_target, T_STRING);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
-		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
+		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
 		if (!NIL_P(rb_val))
 			log_message = StringValueCStr(rb_val);
+
+		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
 	}
 
 	if (git_oid_fromstr(&oid, StringValueCStr(rb_target)) == GIT_OK) {
 		error = git_reference_create(
-			&ref, repo, StringValueCStr(rb_name), &oid, force, signature, log_message);
+			&ref, repo, StringValueCStr(rb_name), &oid, force, log_message);
 	} else {
 		error = git_reference_symbolic_create(
-			&ref, repo, StringValueCStr(rb_name), StringValueCStr(rb_target), force, signature, log_message);
+			&ref, repo, StringValueCStr(rb_name), StringValueCStr(rb_target), force, log_message);
 	}
 
-	git_signature_free(signature);
 	rugged_exception_check(error);
 
 	return rugged_ref_new(rb_cRuggedReference, rb_repo, ref);
@@ -284,26 +266,15 @@ static VALUE rb_git_reference_collection_exist_p(VALUE self, VALUE rb_name_or_re
  *    Overwrites the reference with the given +name+, if it already exists,
  *    instead of raising an exception.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog.
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entry.
- *
  *  If a reference with the given +new_name+ already exists and +:force+ is not +true+,
  *  an exception will be raised.
- *
- *  The +:message+ and +:signature+ options are ignored if the reference does not
- *  belong to the standard set (+HEAD+, +refs/heads/*+, +refs/remotes/*+ or +refs/notes/*+)
- *  and it does not have a reflog.
  */
 static VALUE rb_git_reference_collection_rename(int argc, VALUE *argv, VALUE self)
 {
 	VALUE rb_new_name, rb_name_or_ref, rb_options;
 	VALUE rb_repo = rugged_owner(self);
 	git_reference *ref, *out = NULL;
 	git_repository *repo;
-	git_signature *signature = NULL;
 	char *log_message = NULL;
 	int error, force = 0;
 
@@ -320,24 +291,17 @@ static VALUE rb_git_reference_collection_rename(int argc, VALUE *argv, VALUE sel
 	Data_Get_Struct(rb_repo, git_repository, repo);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
-		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
+		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
 		if (!NIL_P(rb_val))
 			log_message = StringValueCStr(rb_val);
+
+		force = RTEST(rb_hash_aref(rb_options, CSTR2SYM("force")));
 	}
 
 	if ((error = git_reference_lookup(&ref, repo, StringValueCStr(rb_name_or_ref))) == GIT_OK)
-		error = git_reference_rename(&out, ref, StringValueCStr(rb_new_name), force, signature, log_message);
+		error = git_reference_rename(&out, ref, StringValueCStr(rb_new_name), force, log_message);
 
 	git_reference_free(ref);
-	git_signature_free(signature);
 
 	rugged_exception_check(error);
 
@@ -371,7 +335,6 @@ static VALUE rb_git_reference_collection_update(int argc, VALUE *argv, VALUE sel
 {
 	VALUE rb_repo = rugged_owner(self), rb_name_or_ref, rb_target, rb_options;
 	git_repository *repo = NULL;
-	git_signature *signature = NULL;
 	git_reference *ref = NULL, *out = NULL;
 	char *log_message = NULL;
 	int error;
@@ -391,13 +354,7 @@ static VALUE rb_git_reference_collection_update(int argc, VALUE *argv, VALUE sel
 		rb_raise(rb_eTypeError, "Expecting a String or Rugged::Reference instance");
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val;
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
+		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
 		if (!NIL_P(rb_val))
 			log_message = StringValueCStr(rb_val);
 	}
@@ -414,15 +371,14 @@ static VALUE rb_git_reference_collection_update(int argc, VALUE *argv, VALUE sel
 		error = git_oid_fromstr(&target, StringValueCStr(rb_target));
 		if (error) goto cleanup;
 
-		error = git_reference_set_target(&out, ref, &target, signature, log_message);
+		error = git_reference_set_target(&out, ref, &target, log_message);
 	} else {
-		error = git_reference_symbolic_set_target(&out, ref, StringValueCStr(rb_target), signature, log_message);
+		error = git_reference_symbolic_set_target(&out, ref, StringValueCStr(rb_target), log_message);
 	}
 
 cleanup:
 
 	git_reference_free(ref);
-	git_signature_free(signature);
 	rugged_exception_check(error);
 
 	return rugged_ref_new(rb_cRuggedReference, rb_repo, out);

ext/rugged/rugged_remote.c

@@ -608,9 +608,6 @@ static VALUE rb_git_remote_check_connection(int argc, VALUE *argv, VALUE self)
  *  :message ::
  *    The message to insert into the reflogs. Defaults to "fetch".
  *
- *  :signature ::
- *    The signature to be used for updating the reflogs.
- *
  *  Example:
  *
  *    remote = Rugged::Remote.lookup(@repo, 'origin')
@@ -624,7 +621,6 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 {
 	git_remote *remote;
 	git_repository *repo;
-	git_signature *signature = NULL;
 	git_strarray refspecs;
 	git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
 	struct rugged_remote_cb_payload payload = { Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, 0 };
@@ -645,19 +641,15 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 
 	if (!NIL_P(rb_options)) {
-		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
+		VALUE rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
 		if (!NIL_P(rb_val))
 			log_message = StringValueCStr(rb_val);
 	}
 
 	if ((error = git_remote_set_callbacks(remote, &callbacks)))
 		goto cleanup;
 
-	if ((error = git_remote_fetch(remote, &refspecs, signature, log_message)) == GIT_OK) {
+	if ((error = git_remote_fetch(remote, &refspecs, log_message)) == GIT_OK) {
 		const git_transfer_progress *stats = git_remote_stats(remote);
 
 		rb_result = rb_hash_new();
@@ -673,7 +665,6 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 	cleanup:
 
 	xfree(refspecs.strings);
-	git_signature_free(signature);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);
@@ -705,32 +696,23 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
  *    A callback that will be executed each time a reference is updated remotely. It will be
  *    passed the +refname+, +old_oid+ and +new_oid+.
  *
- *  :message ::
- *    A single line log message to be appended to the reflog of each local remote-tracking
- *    branch that gets updated. Defaults to: "fetch".
- *
- *  :signature ::
- *    The signature to be used for populating the reflog entries.
- *
  *  Example:
  *
  *    remote = Rugged::Remote.lookup(@repo, 'origin')
  *    remote.push(["refs/heads/master", ":refs/heads/to_be_deleted"])
  */
 static VALUE rb_git_remote_push(int argc, VALUE *argv, VALUE self)
 {
-	VALUE rb_refspecs, rb_options, rb_val;
+	VALUE rb_refspecs, rb_options;
 	VALUE rb_repo = rugged_owner(self);
 
 	git_repository *repo;
 	git_remote *remote;
 	git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
-	git_signature *signature = NULL;
 	git_strarray refspecs;
 	git_push_options opts = GIT_PUSH_OPTIONS_INIT;
 
 	int error = 0;
-	char *log_message = NULL;
 
 	struct rugged_remote_cb_payload payload = { Qnil, Qnil, Qnil, Qnil, Qnil, rb_hash_new(), 0 };
 
@@ -744,24 +726,13 @@ static VALUE rb_git_remote_push(int argc, VALUE *argv, VALUE self)
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 
-	if (!NIL_P(rb_options)) {
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("message"));
-		if (!NIL_P(rb_val))
-			log_message = StringValueCStr(rb_val);
-
-		rb_val = rb_hash_aref(rb_options, CSTR2SYM("signature"));
-		if (!NIL_P(rb_val))
-			signature = rugged_signature_get(rb_val, repo);
-	}
-
 	if ((error = git_remote_set_callbacks(remote, &callbacks)))
 	    goto cleanup;
 
-	error = git_remote_push(remote, &refspecs, &opts, signature, log_message);
+	error = git_remote_push(remote, &refspecs, &opts);
 
 cleanup:
 	xfree(refspecs.strings);
-	git_signature_free(signature);
 
 	if (payload.exception)
 		rb_jump_tag(payload.exception);