]> git.ipfire.org Git - thirdparty/git.git/commitdiff
builtin/rebase.c: free() "options.strategy_opts"
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Mon, 6 Feb 2023 19:08:12 +0000 (20:08 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Feb 2023 00:03:53 +0000 (16:03 -0800)
When the "strategy_opts" member was added in ba1905a5fef (builtin
rebase: add support for custom merge strategies, 2018-09-04) the
corresponding free() for it at the end of cmd_rebase() wasn't added,
let's do so.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c

index 41e96f0eb5ac734859197b621d4ff7c2c9f91b59..6635f10d5294d16d017eae225de799efb7b1b9aa 100644 (file)
@@ -1850,6 +1850,7 @@ cleanup:
        free(options.gpg_sign_opt);
        string_list_clear(&options.exec, 0);
        free(options.strategy);
+       free(options.strategy_opts);
        strbuf_release(&options.git_format_patch_opt);
        free(squash_onto_name);
        free(keep_base_onto_name);