Skip to content

Commit eaf8160

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e6aac81 commit eaf8160

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static int reset_head(struct object_id *oid, const char *action,
475475
detach_head ? REF_NO_DEREF : 0,
476476
UPDATE_REFS_MSG_ON_ERR);
477477
else {
478-
ret = update_ref(reflog_orig_head, switch_to_branch, oid,
478+
ret = update_ref(reflog_head, switch_to_branch, oid,
479479
NULL, 0, UPDATE_REFS_MSG_ON_ERR);
480480
if (!ret)
481481
ret = create_symref("HEAD", switch_to_branch,

0 commit comments

Comments
 (0)