mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-06 21:44:58 +00:00
Merge pull request #2899 from libgit2/jamill/rebase_opt_ver_check
Check rebase options version on public entry points
This commit is contained in:
commit
de84d9b439
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user