diff options
| author | Jameson Miller <jamill@microsoft.com> | 2015-02-12 15:32:52 -0500 |
|---|---|---|
| committer | Carlos MartÃn Nieto <cmn@dwim.me> | 2015-03-21 21:12:09 +0100 |
| commit | 3bdcea885c7899cfdfc14aa299529acd47f21ad1 (patch) | |
| tree | 2b35c102a778c35a736523991438938576f10cd6 | |
| parent | 7d8e4e30c92bee6e890af49f89aff7bedc2258e0 (diff) | |
| download | libgit2-3bdcea885c7899cfdfc14aa299529acd47f21ad1.tar.gz | |
Check rebase options version on public entry points
| -rw-r--r-- | src/rebase.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |