Commit de84d9b43962ee9d7e8489fe1421da1c68dd5e3b

Edward Thomson 2015-02-12T16:34:01

Merge pull request #2899 from libgit2/jamill/rebase_opt_ver_check Check rebase options version on public entry points

diff --git a/src/rebase.c b/src/rebase.c
index ceb74d3..2e80592 100644
--- a/src/rebase.c
+++ b/src/rebase.c
@@ -634,7 +634,7 @@ int git_rebase_init(
 
 	*out = NULL;
 
-	GITERR_CHECK_VERSION(given_opts, GIT_MERGE_OPTIONS_VERSION, "git_merge_options");
+	GITERR_CHECK_VERSION(given_opts, GIT_REBASE_OPTIONS_VERSION, "git_rebase_options");
 
 	if (!onto)
 		onto = upstream;
@@ -1058,6 +1058,8 @@ int git_rebase_finish(
 
 	assert(rebase);
 
+	GITERR_CHECK_VERSION(given_opts, GIT_REBASE_OPTIONS_VERSION, "git_rebase_options");
+
 	if ((error = rebase_normalize_opts(rebase->repo, &opts, given_opts)) < 0)
 		goto done;