commit-graph: fix a parse_options_concat() leak

When the parse_options_concat() was added to this file in
84e4484f128 (commit-graph: use parse_options_concat(), 2021-08-23) we
wouldn't free() it if we returned early in these cases.

Since "result" is 0 by default we can "goto cleanup" in both cases,
and only need to set "result" if write_commit_graph_reachable() fails.

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

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 0102ac8540ead7d565acf2cb97a1746eb14378d0..93704f95a9da8ab8313e7a17589153951e3bb9fe 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -269,8 +269,8 @@ static int graph_write(int argc, const char **argv, const char *prefix)
 
        if (opts.reachable) {
                if (write_commit_graph_reachable(odb, flags, &write_opts))
-                       return 1;
-               return 0;
+                       result = 1;
+               goto cleanup;
        }
 
        if (opts.stdin_packs) {