Re: [PATCH v5 10/14] diff-lib: handle index diffs with sparse dirs
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 8, 2021, 01:05 UTC
- Message-ID
- <xmqqmts1rwr4.fsf@gitster.g>
- In-Reply-To
- <b2ce649a-00d0-8418-2a3f-9172ff69eccf@gmail.com>
Derrick Stolee <stolee@gmail.com> writes:
Show 11 quoted lines
> On 6/7/2021 8:34 AM, Derrick Stolee via GitGitGadget wrote: >> From: Derrick Stolee <dstolee@microsoft.com> > ... >> + old_entry = make_transient_cache_entry( >> + entry[0].mode, &entry[0].oid, >> + old_path, /* stage */ 0); > > I didn't realize this before I started integrating with > v2.32.0 (which I should have done before submitting v5) that > make_transient_cache_entry() has changed its prototype to > include a memory pool parameter.
Sorry for the trouble---these are usually all known to me for topics I happened to have picked up in 'seen', since I try to make it a rule that 'seen' must be a descendant of 'master'.
How can I usefully communicate the conflicts I find out during the integration cycles to topic owners, I wonder.
Thanks.