[PATCH 2/7] sequencer: delete REBASE_HEAD in correct repo when picking commits
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jan 19, 2024, 10:40 UTC
- Message-ID
- <6f827be3c20a9b06b933509f9b5e0c498a7c3dc9.1705659748.git.ps@pks.im>
- In-Reply-To
- <cover.1705659748.git.ps@pks.im>
When picking commits, we delete some state before executing the next sequencer action on interactive rebases. But while we use the correct repository to calculate paths to state files that need deletion, we use the repo-less `delete_ref()` function to delete REBASE_HEAD. Thus, if the sequencer ran in a different repository than `the_repository`, we would end up deleting the ref in the wrong repository.
Fix this by using `refs_delete_ref()` instead.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c index b9cbc290ea..6f620f5717 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4767,7 +4767,8 @@ static int pick_commits(struct repository *r, unlink(rebase_path_author_script()); unlink(git_path_merge_head(r)); unlink(git_path_auto_merge(r)); - delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); + refs_delete_ref(get_main_ref_store(r), "", "REBASE_HEAD", + NULL, REF_NO_DEREF); if (item->command == TODO_BREAK) { if (!opts->verbose)
-- 2.43.GIT