git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-10 08:22:54 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'ng/add-files-to-cache-wo-rename' into next

Browse Source 
add_files_to_cache() used diff_files() to detect only the paths that
are different between the index and the working tree and add them,
which does not need rename detection, which interfered with unnecessary
conflicts.

* ng/add-files-to-cache-wo-rename:
  read-cache: disable renames in add_files_to_cache
This commit is contained in:
Junio C Hamano
2026-04-02 13:30:45 -07:00
parent 04adce37b9 c0ce43376b
commit 8723880fc0
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
read-cache.c
View File

@@ -4033,6 +4033,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 */
/*

38
t/t2200-add-update.sh
View File

@@ -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 &&