Skip to content

Commit 5b3d2d8

Browse files
Kevin Willfordmjcheetham
authored andcommitted
sparse-checkout: avoid writing entries with the skip-worktree bit
When using the sparse-checkout feature git should not write to the working directory for files with the skip-worktree bit on. With the skip-worktree bit on the file may or may not be in the working directory and if it is not we don't want or need to create it by calling checkout_entry. There are two callers of checkout_target. Both of which check that the file does not exist before calling checkout_target. load_current which make a call to lstat right before calling checkout_target and check_preimage which will only run checkout_taret it stat_ret is less than zero. It sets stat_ret to zero and only if !stat->cached will it lstat the file and set stat_ret to something other than zero. This patch checks if skip-worktree bit is on in checkout_target and just returns so that the entry doesn't not end up in the working directory. This is so that apply will not create a file in the working directory, then update the index but not keep the working directory up to date with the changes that happened in the index. Signed-off-by: Kevin Willford <[email protected]>
1 parent 26c0838 commit 5b3d2d8

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

apply.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3373,6 +3373,24 @@ static int checkout_target(struct index_state *istate,
33733373
{
33743374
struct checkout costate = CHECKOUT_INIT;
33753375

3376+
/*
3377+
* Do not checkout the entry if the skipworktree bit is set
3378+
*
3379+
* Both callers of this method (check_preimage and load_current)
3380+
* check for the existance of the file before calling this
3381+
* method so we know that the file doesn't exist at this point
3382+
* and we don't need to perform that check again here.
3383+
* We just need to check the skip-worktree and return.
3384+
*
3385+
* This is to prevent git from creating a file in the
3386+
* working directory that has the skip-worktree bit on,
3387+
* then updating the index from the patch and not keeping
3388+
* the working directory version up to date with what it
3389+
* changed the index version to be.
3390+
*/
3391+
if (ce_skip_worktree(ce))
3392+
return 0;
3393+
33763394
costate.refresh_cache = 1;
33773395
costate.istate = istate;
33783396
if (checkout_entry(ce, &costate, NULL, NULL) ||

0 commit comments

Comments
 (0)