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>
Johannes Schindelin committed
Mar 3, 2019 at 09:11 UTC
eaf81605b8d17cc15a4a72ffd99d71111b70815b
1 file changed
+1
-1
builtin/rebase.c
+1
-1
@@ -475,7 +475,7 @@ reset_head_refs:
475
detach_head ? REF_NO_DEREF : 0,
476
UPDATE_REFS_MSG_ON_ERR);
477
else {
478
- ret = update_ref(reflog_orig_head, switch_to_branch, oid,
478
+ ret = update_ref(reflog_head, switch_to_branch, oid,
479
NULL, 0, UPDATE_REFS_MSG_ON_ERR);
480
if (!ret)
481
ret = create_symref("HEAD", switch_to_branch,