Ything-RepoMirrors/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-01-25 11:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase: oid member of operation should be const

Browse Source
This commit is contained in:
Edward Thomson
2014-09-11 16:46:46 -04:00
parent ed2c06a6a1
commit e69737d760
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/git2/rebase.h
View File

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

4
src/rebase.c
View File

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