Skip to content

G
git2
Commit de84d9b4 by Edward Thomson
Options

Merge pull request #2899 from libgit2/jamill/rebase_opt_ver_check 

Check rebase options version on public entry points
parents d24a5312 02eb1495
Showing with 3 additions and 1 deletions
src/rebase.c
...@@ -634,7 +634,7 @@ int git_rebase_init( ...@@ -634,7 +634,7 @@ int git_rebase_init(
*out = NULL; *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) if (!onto)
onto = upstream; onto = upstream;
...@@ -1058,6 +1058,8 @@ int git_rebase_finish( ...@@ -1058,6 +1058,8 @@ int git_rebase_finish(
assert(rebase); 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) if ((error = rebase_normalize_opts(rebase->repo, &opts, given_opts)) < 0)
goto done; goto done;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment