Merge pull request libgit2#340 from libgit2/cmn/updates

Update to latest libgit2

ext/rugged/rugged.h

@@ -91,7 +91,7 @@ VALUE rugged_diff_line_new(const git_diff_line *line);
 VALUE rb_git_delta_file_fromC(const git_diff_file *file);
 
 void rugged_parse_diff_options(git_diff_options *opts, VALUE rb_options);
-void rugged_parse_merge_options(git_merge_tree_opts *opts, VALUE rb_options);
+void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options);
 
 VALUE rugged_otype_new(git_otype t);
 git_otype rugged_otype_get(VALUE rb_type);

ext/rugged/rugged_repo.c

@@ -728,7 +728,7 @@ static VALUE rb_git_repo_merge_commits(int argc, VALUE *argv, VALUE self)
 	git_commit *our_commit, *their_commit;
 	git_index *index;
 	git_repository *repo;
-	git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+	git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
 
 	rb_scan_args(argc, argv, "20:", &rb_our_commit, &rb_their_commit, &rb_options);
 

ext/rugged/rugged_settings.c

@@ -48,25 +48,13 @@ static void set_search_path(int level, VALUE value)
 
 static VALUE get_search_path(int level)
 {
-	char *buf = NULL;
-	size_t len = 64;
-	int error;
+	git_buf buf = {NULL};
 	VALUE ret;
 
-	do {
-		len *= 2;
-		buf = xrealloc(buf, len);
+	rugged_exception_check(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, level, &buf));
 
-		error = git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, level, buf, len);
-	} while (error == GIT_EBUFS);
-
-	if (error < 0) {
-		xfree(buf);
-		rugged_exception_raise();
-	}
-
-	ret = rb_str_new_utf8(buf);
-	xfree(buf);
+	ret = rb_str_new_utf8(buf.ptr);
+	git_buf_free(&buf);
 
 	return ret;
 }

ext/rugged/rugged_tree.c

@@ -481,7 +481,7 @@ static VALUE rb_git_tree_diff_workdir(int argc, VALUE *argv, VALUE self)
 	return rugged_diff_new(rb_cRuggedDiff, self, diff);
 }
 
-void rugged_parse_merge_options(git_merge_tree_opts *opts, VALUE rb_options)
+void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)
 {
 	if (!NIL_P(rb_options)) {
 		VALUE rb_value;
@@ -559,7 +559,7 @@ static VALUE rb_git_tree_merge(int argc, VALUE *argv, VALUE self)
 	git_tree *tree, *other_tree, *ancestor_tree;
 	git_repository *repo;
 	git_index *index;
-	git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+	git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
 	int error;
 
 	if (rb_scan_args(argc, argv, "12", &rb_other_tree, &rb_ancestor_tree, &rb_options) == 2) {