]> git.ipfire.org Git - thirdparty/git.git/commitdiff
cherry-pick: free "struct replay_opts" members
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 8 Nov 2022 18:17:49 +0000 (19:17 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2022 03:32:48 +0000 (12:32 +0900)
Call the release_revisions() function added in
1878b5edc03 (revision.[ch]: provide and start using a
release_revisions(), 2022-04-13) in cmd_cherry_pick(), as well as
freeing the xmalloc()'d "revs" member itself.

This is the same change as the one made for cmd_revert() a few lines
above it in fd74ac95ac3 (revert: free "struct replay_opts" members,
2022-07-01).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
builtin/revert.c

index ee32c714a76a7a79e534d52664208638a5e80dd0..0f81c8a795a8473cc10e82116cd7d81a3e2847f4 100644 (file)
@@ -261,6 +261,9 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
        opts.action = REPLAY_PICK;
        sequencer_init_config(&opts);
        res = run_sequencer(argc, argv, &opts);
+       if (opts.revs)
+               release_revisions(opts.revs);
+       free(opts.revs);
        if (res < 0)
                die(_("cherry-pick failed"));
        return res;