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
e69737d7
Commit
e69737d7
authored
Sep 11, 2014
by
Edward Thomson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rebase: oid member of operation should be const
parent
ed2c06a6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
include/git2/rebase.h
+1
-1
src/rebase.c
+2
-2
No files found.
include/git2/rebase.h
View file @
e69737d7
...
...
@@ -90,7 +90,7 @@ typedef struct {
* The commit ID being cherry-picked. This will be populated for
* all operations except those of type `GIT_REBASE_OPERATION_EXEC`.
*/
git_oid
id
;
const
git_oid
id
;
/**
* The executable the user has requested be run. This will only
...
...
src/rebase.c
View file @
e69737d7
...
...
@@ -204,7 +204,7 @@ static int rebase_open_merge(git_rebase *rebase)
git_buf_clear
(
&
cmt
);
if
((
error
=
git_buf_printf
(
&
cmt
,
"cmt.%"
PRIuZ
,
(
i
+
1
)))
<
0
||
(
error
=
rebase_readoid
(
&
operation
->
id
,
&
buf
,
&
state_path
,
cmt
.
ptr
))
<
0
)
(
error
=
rebase_readoid
(
(
git_oid
*
)
&
operation
->
id
,
&
buf
,
&
state_path
,
cmt
.
ptr
))
<
0
)
goto
done
;
}
...
...
@@ -549,7 +549,7 @@ static int rebase_init_operations(
operation
=
git_array_alloc
(
rebase
->
operations
);
operation
->
type
=
GIT_REBASE_OPERATION_PICK
;
git_oid_cpy
(
&
operation
->
id
,
&
id
);
git_oid_cpy
(
(
git_oid
*
)
&
operation
->
id
,
&
id
);
}
error
=
0
;
...
...
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