From 194155f062bc67213c09dea1a91494a55084eba3 Mon Sep 17 00:00:00 2001 From: sharkdp Date: Fri, 31 Aug 2018 23:18:02 +0200 Subject: [PATCH] Fix relative-path computation for Windows --- src/diff.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/diff.rs b/src/diff.rs index ab315c91..a0f8e253 100644 --- a/src/diff.rs +++ b/src/diff.rs @@ -16,7 +16,9 @@ pub type LineChanges = HashMap; pub fn get_git_diff(filename: &str) -> Option { 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()?;