From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon, 6 Feb 2023 19:08:12 +0000 (+0100)
Subject: builtin/rebase.c: free() "options.strategy_opts"
X-Git-Tag: v2.40.0-rc0~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5350408871c69357cbe805fcfa3cc087cca0908;p=thirdparty%2Fgit.git

builtin/rebase.c: free() "options.strategy_opts"

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>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 41e96f0eb5..6635f10d52 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -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);