diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-11-28 14:26:57 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-12-01 11:54:57 +0000 |
| commit | 168fe39bea3368972a8b1a33d5908e73bc790c18 (patch) | |
| tree | c6d07340e2d8d2d66091c44c7763f3e1823acca2 /src/rebase.c | |
| parent | 18e71e6d597abe6c7feb666429c921bd19dc0ba8 (diff) | |
| download | libgit2-ethomson/index_fixes.tar.gz | |
object_type: use new enumeration namesethomson/index_fixes
Use the new object_type enumeration names within the codebase.
Diffstat (limited to 'src/rebase.c')
| -rw-r--r-- | src/rebase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rebase.c b/src/rebase.c index 6503e5fc5..0846487f9 100644 --- a/src/rebase.c +++ b/src/rebase.c @@ -1014,7 +1014,7 @@ static int rebase_commit_merge( if ((error = rebase_ensure_not_dirty(rebase->repo, false, true, GIT_EUNMERGED)) < 0 || (error = git_repository_head(&head, rebase->repo)) < 0 || - (error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)) < 0 || + (error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT)) < 0 || (error = git_repository_index(&index, rebase->repo)) < 0 || (error = rebase_commit__create(&commit, rebase, index, head_commit, author, committer, message_encoding, message)) < 0 || @@ -1288,7 +1288,7 @@ static int return_to_orig_head(git_rebase *rebase) rebase->orig_head_name)) == 0 && (error = git_repository_head(&terminal_ref, rebase->repo)) == 0 && (error = git_reference_peel((git_object **)&terminal_commit, - terminal_ref, GIT_OBJ_COMMIT)) == 0 && + terminal_ref, GIT_OBJECT_COMMIT)) == 0 && (error = git_reference_create_matching(&branch_ref, rebase->repo, rebase->orig_head_name, git_commit_id(terminal_commit), 1, |