From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Thu, 18 May 2017 10:02:32 +0000 (+0100)
Subject: rebase -i: fix reflog message
X-Git-Tag: v2.13.1~42^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ab867b8fc8c19ae99c5414ffcbf57fb1609c94f;p=thirdparty%2Fgit.git

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

diff --git a/sequencer.c b/sequencer.c
index d76dc9cb2b..907319d089 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -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;