proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 20:17:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2899 from libgit2/jamill/rebase_opt_ver_check

Browse Source 
Check rebase options version on public entry points
This commit is contained in:
Edward Thomson 2015-02-12 16:34:01 -05:00
commit de84d9b439
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rebase.c
View File

@ -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(
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;