Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
de84d9b4
Commit
de84d9b4
authored
Feb 12, 2015
by
Edward Thomson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2899 from libgit2/jamill/rebase_opt_ver_check
Check rebase options version on public entry points
parents
d24a5312
02eb1495
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletions
+3
-1
src/rebase.c
+3
-1
No files found.
src/rebase.c
View file @
de84d9b4
...
...
@@ -634,7 +634,7 @@ int git_rebase_init(
*
out
=
NULL
;
GITERR_CHECK_VERSION
(
given_opts
,
GIT_
MERGE_OPTIONS_VERSION
,
"git_merg
e_options"
);
GITERR_CHECK_VERSION
(
given_opts
,
GIT_
REBASE_OPTIONS_VERSION
,
"git_rebas
e_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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment