Thread (7 messages) 7 messages, 4 authors, 2023-01-07

bug?: ORIG_HEAD incorrect after reset during git-rebase -i

flat view

From: Erik Cervin Edin <hidden>
Date: 2021-12-16 14:31:01

Steps to reproduce:
1. git-rebase -i
2. edit XYZ
3. git-reset HEAD~
4. git-commit -C ORIG_HEAD -a
5. git-rebase --continue
6. git-show ORIG_HEAD

Expected behavior:
ORIG_HEAD should point at the previous HEAD of the rebased branch

Actual behavior:
ORIG_HEAD points to XYZ

My understanding from reading https://stackoverflow.com/a/64949884 is
that this is incorrect behavior.

Perhaps this is as intended but I would at least personally prefer
that ORIG_HEAD would point to the previous HEAD of the rebased branch.

Seen in:
git version 2.31.1.windows.1

Possibly related to
e100bea481 - rebase -i: stop overwriting ORIG_HEAD buffer
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help