]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4fee6ff c0ce433)
Merge branch 'ng/add-files-to-cache-wo-rename'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2026 17:19:17 +0000 (10:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2026 17:19:18 +0000 (10:19 -0700)
commitd8c553bbed21761a8af3fa40a20518e210e78a0d
tree96b22d1e2c25bbc8dd6564b27cf02ade0ee79831tree | snapshot
parent4fee6ff3b23321b55073ca2d13c4e2aa6adaea65commit | diff
parentc0ce43376b178d876bce2073b81737ce49657defcommit | diff
Merge branch 'ng/add-files-to-cache-wo-rename'

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
read-cache.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.