Thread (37 messages) 37 messages, 7 authors, 2022-08-04

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

From: Calvin Wan <hidden>
Date: 2022-07-25 22:04:04

Hi Ævar,

Thanks in advance for the suggestions and catching my memory leak.
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help