mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: use struct object_id rather than looking up commit

Browse Source 
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>
This commit is contained in:
Phillip Wood
2020-11-04 15:29:38 +00:00
committed by Junio C Hamano
parent e100bea481
commit f3e27a02d5
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/rebase.c
View File

@ -370,8 +370,9 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
split_exec_commands(opts->cmd, &commands);
ret = complete_action(the_repository, &replay, flags,
shortrevisions, opts->onto_name, opts->onto, head_hash,
&commands, opts->autosquash, &todo_list);
shortrevisions, opts->onto_name, opts->onto,
&opts->orig_head, &commands, opts->autosquash,
&todo_list);
}
string_list_clear(&commands, 0);