Commits on Jul 1, 2021

1. add/rm: allow adding sparse entries when virtual …

   Upstream, a20f704 (add: warn when asked to update SKIP_WORKTREE entries,
   2021-04-08) modified how 'git add <pathspec>' works with cache entries
   marked with the SKIP_WORKTREE bit. The intention is to prevent a user
   from accidentally adding a path that is outside their sparse-checkout
   definition but somehow matches an existing index entry.
   
   A similar change for 'git rm' happened in d5f4b82 (rm: honor sparse
   checkout patterns, 2021-04-08).
   
   This breaks when using the virtual filesystem in VFS for Git. It is
   rare, but we could be in a scenario where the user has staged a change
   and then the file is projected away. If the user re-adds the file, then
   this warning causes the command to fail with the advise message.
   
   Disable this logic when core_virtualfilesystem is enabled.
   
   Signed-off-by: Derrick Stolee <dstolee@microsoft.com>

   

   derrickstolee committed Jul 1, 2021
   Configuration menu

   • View commit details
   • Copy full SHA for a5789d2
   • Browse repository at this point

   Copy the full SHA

   a5789d2 View commit details

   Browse the repository at this point in the history