Re: [PATCH v10 33/36] merge-recursive: fix was_tracked() to quit lying with some renamed paths

From: Martin Ågren <martin.agren@gmail.com>
Date: Apr 19, 2018, 20:39 UTC
Message-ID: <CAN0heSquJboMMgay+5XomqXCGoHtXxf1mJBmY_L7y+AA4eG0KA@mail.gmail.com>
In-Reply-To: <20180419175823.7946-34-newren@gmail.com>

On 19 April 2018 at 19:58, Elijah Newren <newren@gmail.com> wrote:

Show 7 quoted lines

> +       /* Free the extra index left from git_merge_trees() */
> +       /*
> +        * FIXME: Need to also data allocated by setup_unpack_trees_porcelain()
> +        * tucked away in o->unpack_opts.msgs, but the problem is that only
> +        * half of it refers to dynamically allocated data, while the other
> +        * half points at static strings.
> +        */

Timing. I've been preparing a patch that provides `clear_unpack_trees_porcelain()` and fixes all such leaks. (About 10% of all the leaks that are reported when I run the test-suite!) My patch conflicts with this series for obvious reasons. Figuring out the conflict resolution might be non-trivial, and I suspect it would even be an evil merge. I'll be holding off on that patch until this has landed.

BTW: s/also data/also free data/. But since I'm promising to get rid of
this TODO quite soon after this is merged... ;-)

Martin