Skip to content

Commit

Permalink
merge-ort: ignore skip-worktree bit with virtual filesystem
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
derrickstolee committed Aug 31, 2022
1 parent c1ac949 commit b5cd85b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion merge-ort.c
Original file line number Diff line number Diff line change
Expand Up @@ -4226,7 +4226,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,
path,
"cruft");
Expand Down

0 comments on commit b5cd85b

Please sign in to comment.