rebase -i: fix reflog message
When rebase -i was converted to C a bug was introduced into the code that creates the reflog message. Instead of saying rebase -i (finish): <head-name> onto <onto> it says rebase -i (finish): <head-name> onto <orig-head><onto> as the strbuf is not reset between reading the value of <orig-head> and <onto>. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a42e1b4194
commit
4ab867b8fc
@ -2058,6 +2058,7 @@ cleanup_head_ref:
|
||||
res = error(_("could not read orig-head"));
|
||||
goto cleanup_head_ref;
|
||||
}
|
||||
strbuf_reset(&buf);
|
||||
if (!read_oneliner(&buf, rebase_path_onto(), 0)) {
|
||||
res = error(_("could not read 'onto'"));
|
||||
goto cleanup_head_ref;
|
||||
|
Loading…
Reference in New Issue
Block a user