diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-02-12 16:34:01 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-02-12 16:34:01 -0500 |
| commit | de84d9b43962ee9d7e8489fe1421da1c68dd5e3b (patch) | |
| tree | 9b0916b34cdf135700218635a14ad677a2eae161 | |
| parent | d24a5312d8ab6d3cdb259e450ec9f1e2e6f3399d (diff) | |
| parent | 02eb1495a5248c8f676e15fd12e1be28d4f22480 (diff) | |
| download | libgit2-de84d9b43962ee9d7e8489fe1421da1c68dd5e3b.tar.gz | |
Merge pull request #2899 from libgit2/jamill/rebase_opt_ver_check
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; |