Skip to content

Commit 52bc255

Browse files
committed
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]>
1 parent df89f27 commit 52bc255

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
@@ -476,7 +476,7 @@ static int reset_head(struct object_id *oid, const char *action,
476476
detach_head ? REF_NO_DEREF : 0,
477477
UPDATE_REFS_MSG_ON_ERR);
478478
else {
479-
ret = update_ref(reflog_orig_head, switch_to_branch, oid,
479+
ret = update_ref(reflog_head, switch_to_branch, oid,
480480
NULL, 0, UPDATE_REFS_MSG_ON_ERR);
481481
if (!ret)
482482
ret = create_symref("HEAD", switch_to_branch,

0 commit comments

Comments
 (0)