path: root/Documentation/git-add.txt
diff options
authorDerrick Stolee <>2021-09-24 15:39:07 (GMT)
committerJunio C Hamano <>2021-09-28 17:31:02 (GMT)
commit49fdd51a235fe2ca91a6d1b16315204f0f016a96 (patch)
treea98ca6a6ec6c35b59843be5f415ac34332291d24 /Documentation/git-add.txt
parent105e8b014b1d584174aca81081ee5428caea03cb (diff)
add: skip tracked paths outside sparse-checkout cone
When 'git add' adds a tracked file that is outside of the sparse-checkout cone, it checks the SKIP_WORKTREE bit to see if the file exists outside of the sparse-checkout cone. This is usually correct, except in the case of a merge conflict outside of the cone. Modify add_pathspec_matched_against_index() to be more careful about paths by checking the sparse-checkout patterns in addition to the SKIP_WORKTREE bit. This causes 'git add' to no longer allow files outside of the cone that removed the SKIP_WORKTREE bit due to a merge conflict. With only this change, users will only be able to add the file after adding the file to the sparse-checkout cone. A later change will allow users to force adding even though the file is outside of the sparse-checkout cone. Signed-off-by: Derrick Stolee <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-add.txt')
0 files changed, 0 insertions, 0 deletions