diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2020-11-04 16:29:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-04 23:10:41 +0100 |
| commit | f3e27a02d598084a0ef5c8dd6b410bd6a5c5299f (patch) | |
| tree | 9d85937d9d4cc649fa862b0d11cda79044d7bc7c /sequencer.h | |
| parent | rebase -i: stop overwriting ORIG_HEAD buffer (diff) | |
| download | git-f3e27a02d598084a0ef5c8dd6b410bd6a5c5299f.tar.xz git-f3e27a02d598084a0ef5c8dd6b410bd6a5c5299f.zip | |
rebase -i: use struct object_id rather than looking up commit
We already have a struct object_id containing the oid that we want to
set ORIG_HEAD to so use that rather than converting it to a string and
then calling get_oid() on that string.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sequencer.h b/sequencer.h index b2a501e445..ea56825488 100644 --- a/sequencer.h +++ b/sequencer.h @@ -163,8 +163,9 @@ void todo_list_add_exec_commands(struct todo_list *todo_list, struct string_list *commands); int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags, const char *shortrevisions, const char *onto_name, - struct commit *onto, const char *orig_head, struct string_list *commands, - unsigned autosquash, struct todo_list *todo_list); + struct commit *onto, const struct object_id *orig_head, + struct string_list *commands, unsigned autosquash, + struct todo_list *todo_list); int todo_list_rearrange_squash(struct todo_list *todo_list); /* |