Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 17:08:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash on broken symlinks

Browse source
This commit is contained in:
Stephan Dilly 2020-03-28 19:23:48 +01:00
parent b04758e039
commit 6ca1eb05e8
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
asyncgit/src/sync/diff.rs
View file

@ -138,8 +138,7 @@ pub fn get_diff(repo_path: &str, p: String, stage: bool) -> Diff {
let newfile_path =
repo_path.join(delta.new_file().path().unwrap());
let newfile_content =
fs::read_to_string(&newfile_path).unwrap();
let newfile_content = new_file_content(&newfile_path);
let mut patch = Patch::from_buffers(
&[],
@ -183,6 +182,20 @@ pub fn get_diff(repo_path: &str, p: String, stage: bool) -> Diff {
res
}
fn new_file_content(path: &Path) -> String {
if let Ok(meta) = fs::symlink_metadata(path) {
if meta.file_type().is_symlink() {
fs::read_link(path).unwrap().to_str().unwrap().to_string()
} else {
"file not found".to_string()
}
} else if let Ok(content) = fs::read_to_string(path) {
content
} else {
"file not found".to_string()
}
}
#[cfg(test)]
mod tests {
use super::get_diff;