Re: [PATCH v2 1/2] revision: ensure MERGE_HEAD is a ref in prepare_show_merge

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 15, 2024, 17:19 UTC
Message-ID: <xmqq4jfe5xb1.fsf@gitster.g>
In-Reply-To: <ZaUYyEAdr4oTImL-@tanuki>

Patrick Steinhardt <ps@pks.im> writes:

Show 5 quoted lines

>> Which would mean that we do not need a separate "other_head"
>> variable, and instead can use "MERGE_HEAD".
>
> There is no need for this, is there? We have already resolved the ref to
> an object ID, so why not use that via `add_pending_oid()`?

add_pending_oid() and its callees use the name only for human consumption (e.g., in error messages), as they all already have the object name.

$ 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.