pr-773/phillipwood/wip/rebase-fix-orig_head-handling-v2
tagged this
04 Nov 15:29
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 Changes since v1: * Updated the commit message to patch 1 as suggested by Junio * Moved the conversion from find_unique_abbrev() to oid_to_hex() from patch 1 to patch 4 * Fixed a compilation error in patch 3 (the required change was in patch 4 by a mistake) Cc: Johannes Schindelin Johannes.Schindelin@gmx.de [Johannes.Schindelin@gmx.de], Caspar Duregger herr.kaste@gmail.com [herr.kaste@gmail.com] 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 Submitted-As: https://lore.kernel.org/git/pull.773.v2.git.1604503780.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.773.git.1603807337.gitgitgadget@gmail.com
Assets 2
-
2020-11-04T15:29:40Z -
2020-11-04T15:29:40Z - Loading