From 02eb1495a5248c8f676e15fd12e1be28d4f22480 Mon Sep 17 00:00:00 2001 From: Jameson Miller Date: Thu, 12 Feb 2015 15:32:52 -0500 Subject: [PATCH] Check rebase options version on public entry points --- src/rebase.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rebase.c b/src/rebase.c index ceb74d39f..2e805929e 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;