From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 3 Mar 2019 17:11:54 +0000 (-0800)
Subject: built-in rebase: use the correct reflog when switching branches
X-Git-Tag: v2.22.0-rc0~142^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eaf81605b8d17cc15a4a72ffd99d71111b70815b;p=thirdparty%2Fgit.git

built-in rebase: use the correct reflog when switching branches

By mistake, we used the reflog intended for ORIG_HEAD.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 813ec284ca..aa469ec964 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -475,7 +475,7 @@ reset_head_refs:
 				 detach_head ? REF_NO_DEREF : 0,
 				 UPDATE_REFS_MSG_ON_ERR);
 	else {
-		ret = update_ref(reflog_orig_head, switch_to_branch, oid,
+		ret = update_ref(reflog_head, switch_to_branch, oid,
 				 NULL, 0, UPDATE_REFS_MSG_ON_ERR);
 		if (!ret)
 			ret = create_symref("HEAD", switch_to_branch,