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:
Michael Sloan 2024-11-18 10:55:44 -08:00 committed by GitHub
parent f12981db32
commit d265e44209
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1775,11 +1775,12 @@ impl Buffer {
return false;
};
match file.disk_state() {
DiskState::New | DiskState::Deleted => true,
DiskState::New => false,
DiskState::Present { mtime } => match self.saved_mtime {
Some(saved_mtime) => mtime > saved_mtime && self.has_unsaved_edits(),
None => true,
},
DiskState::Deleted => true,
}
}