merge-ort: ignore skip-worktree bit with virtual filesystem

Without this change, the mere conflicts start creating <path>~cruft files on-disk, which is caught by the VFS for Git functional tests. Signed-off-by: Derrick Stolee <[email protected]>
microsoft · Oct 30, 2021 · 9461489 · 9461489
1 parent 5bbeeec
commit 9461489
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/merge-ort.c b/merge-ort.c
@@ -4143,7 +4143,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
 			if (ce_skip_worktree(ce)) {
 				struct stat st;
 
-				if (!lstat(path, &st)) {
+				if (!core_virtualfilesystem && !lstat(path, &st)) {
 					char *new_name = unique_path(&opt->priv->paths,
 								     path,
 								     "cruft");