Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix relative-path computation for Windows

This commit is contained in:
sharkdp 2018-08-31 23:18:02 +02:00 committed by David Peter
parent a6ff3b900d
commit 194155f062
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff.rs
View File

@ -16,7 +16,9 @@ pub type LineChanges = HashMap<u32, LineChange>;
pub fn get_git_diff(filename: &str) -> Option<LineChanges> {
let repo = Repository::discover(&filename).ok()?;
let path_absolute = fs::canonicalize(&filename).ok()?;
let path_relative_to_repo = path_absolute.strip_prefix(repo.workdir()?).ok()?;
let path_relative_to_repo = path_absolute
.strip_prefix(fs::canonicalize(repo.workdir()?).ok()?)
.ok()?;
let mut diff_options = DiffOptions::new();
let pathspec = path_relative_to_repo.into_c_string().ok()?;