]> git.ipfire.org Git - thirdparty/git.git/commit
rebase: stop reading and writing unnecessary strategy state
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Mon, 10 Apr 2023 09:08:27 +0000 (10:08 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Apr 2023 16:53:19 +0000 (09:53 -0700)
commit461434a013c2289fb59070e1a118d39441828847
treebea2ed6c73fa4f0cd79b7031b95e42b5b7205c32
parent140b9478dad5d19543c1cb4fd293ccec228f1240
rebase: stop reading and writing unnecessary strategy state

The state files for "--strategy" and "--strategy-option" are written and
read twice, once by builtin/rebase.c and then by sequencer.c. This is an
artifact of the scripted rebase and the need to support "rebase
--preserve-merges". Now that "--preserve-merges" no-longer exists we
only need to read and write these files in sequencer.c. This enables us
to remove a call to free() in read_strategy_opts() that was added by
f1f4ebf432 (sequencer.c: fix "opts->strategy" leak in
read_strategy_opts(), 2022-11-08) as this commit fixes the root cause of
that leak.

There is further scope for removing duplication in the reading and
writing of state files between builtin/rebase.c and sequencer.c but that
is left for a follow up series.

Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c
sequencer.c