The buffer containing the oid for ORIG_HEAD is overwritten before ORIG_HEAD is created. This series fixes that bug and then converts the code to use struct object_id rather than passing around strings. Thanks to Caspar for reporting the bug and providing a reproducible example Phillip Wood (4): rebase -i: stop overwriting ORIG_HEAD buffer rebase -i: use struct object_id rather than looking up commit rebase -i: use struct object_id when writing state rebase -i: simplify get_revision_ranges() builtin/rebase.c | 20 ++++++++++---------- sequencer.c | 15 ++++++--------- sequencer.h | 7 ++++--- t/t3404-rebase-interactive.sh | 11 +++++++++++ 4 files changed, 31 insertions(+), 22 deletions(-) base-commit: 2e673356aefa8ed19be3c878f966ad6189ecb510 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-773%2Fphillipwood%2Fwip%2Frebase-fix-orig_head-handling-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-773/phillipwood/wip/rebase-fix-orig_head-handling-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/773 -- gitgitgadget