git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] read-cache: disable renames in add_files_to_cache

From
Blind Mansion <blindmansion@gmail.com>
Date
Apr 1, 2026, 19:08 UTC
Message-ID
<CAEu6FALj=789M=gASYpWT9CGC4_802-X=9sGoF=YndFRCgcb1w@mail.gmail.com>
In-Reply-To
<20260401190033.11325-1-blindmansion@gmail.com>

Thanks for the review. I encountered this bug while doing differential testing against another implementation, and enjoyed learning more about this process. I have sent v2 with the metadata fix and test cleanups you noted.

I also audited nearby callback-driven index refresh/staging paths and did not find another obvious instance of this specific pattern outside add_files_to_cache().

On Wed, Apr 1, 2026 at 3:00 PM Nick Golden <blindmansion@gmail.com> wrote:
Show 88 quoted lines
>
> add_files_to_cache() refreshes the index from worktree changes and does
> not need rename detection. When unmerged entries and a deleted stage-0
> path are present together, rename detection can pair them and rewrite an
> unmerged diff pair to point at the deleted path.
>
> That later makes "git commit -a" and "git add -u" try to stat the
> deleted path and die with "unable to stat". Disable rename detection in
> this callback-driven staging path and add a regression test covering the
> crash.
>
> Signed-off-by: Nick Golden <blindmansion@gmail.com>
> ---
> Changes since v1:
> - use sed instead of perl in the regression test
> - shorten the sample line content
> - stop asserting that stderr is empty
> - simplify the final ls-files check
> - use real name and add Signed-off-by
>
>  read-cache.c          |  1 +
>  t/t2200-add-update.sh | 38 ++++++++++++++++++++++++++++++++++++++
>  2 files changed, 39 insertions(+)
>
> diff --git a/read-cache.c b/read-cache.c
> index 5049f9b..d938abc 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -4049,6 +4049,7 @@ int add_files_to_cache(struct repository *repo, const char *prefix,
>         rev.diffopt.format_callback = update_callback;
>         rev.diffopt.format_callback_data = &data;
>         rev.diffopt.flags.override_submodule_config = 1;
> +       rev.diffopt.detect_rename = 0; /* staging worktree changes does not need renames */
>         rev.max_count = 0; /* do not compare unmerged paths with stage #2 */
>
>         /*
> diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
> index 06e83d3..0a96655 100755
> --- a/t/t2200-add-update.sh
> +++ b/t/t2200-add-update.sh
> @@ -200,6 +200,44 @@ test_expect_success 'add -u resolves unmerged paths' '
>         test_cmp expect actual
>  '
>
> +test_expect_success 'add -u avoids rename pairing on unmerged paths' '
> +       test_create_repo rename-crash &&
> +       (
> +               cd rename-crash &&
> +               test_seq 1 100 |
> +               sed "s/.*/line &: same text/" >conflict.txt &&
> +               cp conflict.txt bystander.txt &&
> +               git add conflict.txt bystander.txt &&
> +               git commit -m "initial: two files with identical content" &&
> +               main_branch=$(git symbolic-ref --short HEAD) &&
> +               git checkout -b feature &&
> +               sed "s/^line 50:.*/line 50: FEATURE/" \
> +                       conflict.txt >conflict.txt.tmp &&
> +               mv conflict.txt.tmp conflict.txt &&
> +               git add conflict.txt &&
> +               git commit -m "feature: modify line 50" &&
> +               git checkout "$main_branch" &&
> +               sed "s/^line 50:.*/line 50: MAIN/" \
> +                       conflict.txt >conflict.txt.tmp &&
> +               mv conflict.txt.tmp conflict.txt &&
> +               git add conflict.txt &&
> +               git commit -m "main: modify line 50 differently" &&
> +               test_must_fail git merge feature &&
> +               rm bystander.txt &&
> +               git add -u >out &&
> +               test_must_be_empty out &&
> +               git ls-files -u >actual &&
> +               test_must_be_empty actual &&
> +               git ls-files bystander.txt conflict.txt >actual &&
> +               cat >expect <<-\EOF &&
> +               conflict.txt
> +               EOF
> +               test_cmp expect actual &&
> +               git diff-files --name-only >actual &&
> +               test_must_be_empty actual
> +       )
> +'
> +
>  test_expect_success '"add -u non-existent" should fail' '
>         test_must_fail git add -u non-existent &&
>         git ls-files >actual &&
> --
> 2.53.0
>
Previous: Nick Golden
Message 5 of 5 in “BUG: git commit -a crashes with "unable to stat" during unresolved merge”
  1. Nick GoldenMar 31, 2026
  2. read-cache: disable renames in add_files_to_cacheblindmansion, Apr 1, 2026
  3. Junio C HamanoApr 1, 2026
  4. read-cache: disable renames in add_files_to_cacheNick Golden, Apr 1, 2026
  5. Blind MansionApr 1, 2026

Read the whole thread, see it on lore, or plain text.

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