Skip to content

Commit 407b49f

Browse files
committed
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 <dstolee@microsoft.com>
1 parent 0cf3e91 commit 407b49f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

merge-ort.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4143,7 +4143,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
41434143
if (ce_skip_worktree(ce)) {
41444144
struct stat st;
41454145

4146-
if (!lstat(path, &st)) {
4146+
if (!core_virtualfilesystem && !lstat(path, &st)) {
41474147
char *new_name = unique_path(&opt->priv->paths,
41484148
path,
41494149
"cruft");

0 commit comments

Comments
 (0)