Do not remove files outside the sparse-checkout

Kevin Willford · dscho · commit 8809b2444818 · 2023-08-11T08:55:05.000+02:00
Signed-off-by: Kevin Willford &lt;kewillf@microsoft.com&gt;
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -569,7 +569,9 @@ static int apply_sparse_checkout(struct index_state *istate,
 			ce->ce_flags &= ~CE_SKIP_WORKTREE;
 			return -1;
 		}
-		ce->ce_flags |= CE_WT_REMOVE;
+		if (!gvfs_config_is_set(GVFS_NO_DELETE_OUTSIDE_SPARSECHECKOUT))
+			ce->ce_flags |= CE_WT_REMOVE;
+
 		ce->ce_flags &= ~CE_UPDATE;
 	}
 	if (was_skip_worktree && !ce_skip_worktree(ce)) {

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,9 @@ static int apply_sparse_checkout(struct index_state *istate,`
`569`	`569`	`ce->ce_flags &= ~CE_SKIP_WORKTREE;`
`570`	`570`	`return -1;`
`571`	`571`	`}`
`572`		`- ce->ce_flags \|= CE_WT_REMOVE;`
	`572`	`+ if (!gvfs_config_is_set(GVFS_NO_DELETE_OUTSIDE_SPARSECHECKOUT))`
	`573`	`+ ce->ce_flags \|= CE_WT_REMOVE;`
	`574`	`+`
`573`	`575`	`ce->ce_flags &= ~CE_UPDATE;`
`574`	`576`	`}`
`575`	`577`	`if (was_skip_worktree && !ce_skip_worktree(ce)) {`