Re: [PATCH v2 13/14] merge: use commit-slab in merge remote desc instead of commit->util
- From
Ramsay Jones <ramsay@ramsayjones.plus.com>
- Date
- May 18, 2018, 17:54 UTC
- Message-ID
- <06336c49-dfec-9314-8798-2f380d57bc93@ramsayjones.plus.com>
- In-Reply-To
- <xmqqtvr54sk6.fsf@gitster-ct.c.googlers.com>
On 18/05/18 03:16, Junio C Hamano wrote:
Show 14 quoted lines
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes: > >> diff --git a/commit.c b/commit.c >> index 57049118a5..8202067cd5 100644 >> --- a/commit.c >> +++ b/commit.c >> @@ -1574,13 +1574,21 @@ int commit_tree_extended(const char *msg, size_t msg_len, >> return result; >> } >> >> +define_commit_slab(merge_desc_slab, struct merge_remote_desc *); >> +struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, merge_desc_slab); > > s/^/static /; otherwise sparse would complain?
Indeed, it already did (see [1]). ;-)
Your fixup, commit dc2172daed, on the 'nd/commit-util-to-slab' branch has indeed fixed it up.
Thanks!
[1] https://public-inbox.org/git/e2c4276f-bcfd-faaa-f9ee-cb50e99da663@ramsayjones.plus.com/
ATB, Ramsay Jones