Re: [PATCH v5] submodule merge: update conflict error message

From: Calvin Wan <calvinwan@google.com>
Date: Jul 25, 2022, 22:03 UTC
Message-ID: <CAFySSZDrXiiStn9BfKzxjXU-QsR6Bq1cWf9FQHTG-D9kUyHhng@mail.gmail.com>
In-Reply-To: <220725.86r129pd8m.gmgdl@evledraar.gmail.com>

Hi Ævar,

Thanks in advance for the suggestions and catching my memory leak.

Show 5 quoted lines

> Perhaps we could also continue down that path and do this with just one
> allocation for that "oid/resolution_exists" side-data. I.e. you'd have a
> second string_list in the struct, have a non-NULL util mean "resolution
> exists", and the "string" there would be nodup'd (we could refer to the
> "string" in the first one).

Since I am removing the "resolution exists" field, I modified your changes to use the util to only hold the abbrev.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.