Re: [PATCH v3 11/23] ll-merge.c: remove implicit dependency on the_index

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 11, 2018, 16:56 UTC
Message-ID: <xmqq5zzcq8fe.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180909085418.31531-12-pclouds@gmail.com>

Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:

Show 11 quoted lines

> ---
>  apply.c            |  9 ++++++---
>  builtin/checkout.c |  3 ++-
>  diff.c             |  2 +-
>  ll-merge.c         | 17 +++++++++--------
>  ll-merge.h         |  5 ++++-
>  merge-blobs.c      |  3 ++-
>  merge-recursive.c  |  3 ++-
>  notes-merge.c      |  3 ++-
>  rerere.c           | 10 ++++++----
>  9 files changed, 34 insertions(+), 21 deletions(-)

This one looks good to me. The only reason why low-level merge needs to care about the index is the renormalization, and the updated code seems to correctly carry around the istate in question.

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