describe: rename git_describe_opts to git_describe_options

And implement the option init functions for this and the format options.

4 files changed, 13 insertions, 13 deletions

diff --git a/tests/describe/describe.c b/tests/describe/describe.c
index d2df36c91..9a523a169 100644
--- a/tests/describe/describe.c
+++ b/tests/describe/describe.c
@@ -4,7 +4,7 @@
 void test_describe_describe__can_describe_against_a_bare_repo(void)
 {
 	git_repository *repo;
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
 
 	cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git")));
@@ -31,7 +31,7 @@ static int delete_cb(git_reference *ref, void *payload)
 void test_describe_describe__cannot_describe_against_a_repo_with_no_ref(void)
 {
 	git_repository *repo;
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_buf buf = GIT_BUF_INIT;
 	git_object *object;
 	git_describe_result *result = NULL;
diff --git a/tests/describe/describe_helpers.c b/tests/describe/describe_helpers.c
index e4dfcef3e..7a6a73cb8 100644
--- a/tests/describe/describe_helpers.c
+++ b/tests/describe/describe_helpers.c
@@ -4,7 +4,7 @@ void assert_describe(
 	const char *expected_output,
 	const char *revparse_spec,
 	git_repository *repo,
-	git_describe_opts *opts,
+	git_describe_options *opts,
 	git_describe_format_options *fmt_opts)
 {
 	git_object *object;
@@ -26,7 +26,7 @@ void assert_describe(
 void assert_describe_workdir(
 	const char *expected_output,
 	git_repository *repo,
-	git_describe_opts *opts,
+	git_describe_options *opts,
 	git_describe_format_options *fmt_opts)
 {
 	git_buf label = GIT_BUF_INIT;
diff --git a/tests/describe/describe_helpers.h b/tests/describe/describe_helpers.h
index 5d6417261..16a0638e3 100644
--- a/tests/describe/describe_helpers.h
+++ b/tests/describe/describe_helpers.h
@@ -5,11 +5,11 @@ extern void assert_describe(
 	const char *expected_output,
 	const char *revparse_spec,
 	git_repository *repo,
-	git_describe_opts *opts,
+	git_describe_options *opts,
 	git_describe_format_options *fmt_opts);
 
 extern void assert_describe_workdir(
 	const char *expected_output,
 	git_repository *repo,
-	git_describe_opts *opts,
+	git_describe_options *opts,
 	git_describe_format_options *fmt_opts);
diff --git a/tests/describe/t6120.c b/tests/describe/t6120.c
index b470938d0..2377335a5 100644
--- a/tests/describe/t6120.c
+++ b/tests/describe/t6120.c
@@ -18,7 +18,7 @@ void test_describe_t6120__cleanup(void)
 
 void test_describe_t6120__default(void)
 {
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
 
 	assert_describe("A-*", "HEAD", repo, &opts, &fmt_opts);
@@ -31,7 +31,7 @@ void test_describe_t6120__default(void)
 
 void test_describe_t6120__tags(void)
 {
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
 	opts.describe_strategy = GIT_DESCRIBE_TAGS;
 
@@ -45,7 +45,7 @@ void test_describe_t6120__tags(void)
 
 void test_describe_t6120__all(void)
 {
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
 	opts.describe_strategy = GIT_DESCRIBE_ALL;
 
@@ -56,7 +56,7 @@ void test_describe_t6120__all(void)
 
 void test_describe_t6120__longformat(void)
 {
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
 
 	fmt_opts.always_use_long_format = 1;
@@ -67,7 +67,7 @@ void test_describe_t6120__longformat(void)
 
 void test_describe_t6120__firstparent(void)
 {
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
 	opts.describe_strategy = GIT_DESCRIBE_TAGS;
 
@@ -79,7 +79,7 @@ void test_describe_t6120__firstparent(void)
 
 void test_describe_t6120__workdir(void)
 {
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
 
 	assert_describe_workdir("A-*[0-9a-f]", repo, &opts, &fmt_opts);
@@ -119,7 +119,7 @@ static void commit_and_tag(
 
 void test_describe_t6120__pattern(void)
 {
-	git_describe_opts opts = GIT_DESCRIBE_OPTIONS_INIT;
+	git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
 	git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
 	git_oid tag_id;
 	git_object *head;