Git 2.37.1

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index fd1bbde061fa4cf54b2d0c65c61d65e44c7cd8c1..b83a129b4313d9c6a4f6434fbe2002068ef7a542 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -522,10 +522,10 @@ static struct stage_data *insert_stage_data(struct repository *r,
  */
 static struct string_list *get_unmerged(struct index_state *istate)
 {
-       struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
+       struct string_list *unmerged = xmalloc(sizeof(struct string_list));
        int i;
 
-       unmerged->strdup_strings = 1;
+       string_list_init_dup(unmerged);
 
        /* TODO: audit for interaction with sparse-index. */
        ensure_full_index(istate);
@@ -1160,6 +1160,7 @@ static int find_first_merges(struct repository *repo,
        }
 
        object_array_clear(&merges);
+       release_revisions(&revs);
        return result->nr;
 }