]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 04adce3 c0ce433)
Merge branch 'ng/add-files-to-cache-wo-rename' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2026 20:30:45 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2026 20:30:45 +0000 (13:30 -0700)
commit8723880fc08b97899c10c847a91c2b69dfbd0b21
treea1f83125eec90d5d61f798e336360bd9923a0bd5tree | snapshot
parent04adce37b9e1e2265200ef4aa7a327c042a42416commit | diff
parentc0ce43376b178d876bce2073b81737ce49657defcommit | diff
Merge branch 'ng/add-files-to-cache-wo-rename' into next

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.