Don't treat absence of a file on fs as conflict for new files from CLI (#20828)
Closes #20827 Release Notes: - Fixes bug where save for new files created via CLI would report a conflict and ask about overwriting.
This commit is contained in:
parent
f12981db32
commit
d265e44209
1 changed files with 2 additions and 1 deletions
|
@ -1775,11 +1775,12 @@ impl Buffer {
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
match file.disk_state() {
|
match file.disk_state() {
|
||||||
DiskState::New | DiskState::Deleted => true,
|
DiskState::New => false,
|
||||||
DiskState::Present { mtime } => match self.saved_mtime {
|
DiskState::Present { mtime } => match self.saved_mtime {
|
||||||
Some(saved_mtime) => mtime > saved_mtime && self.has_unsaved_edits(),
|
Some(saved_mtime) => mtime > saved_mtime && self.has_unsaved_edits(),
|
||||||
None => true,
|
None => true,
|
||||||
},
|
},
|
||||||
|
DiskState::Deleted => true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue