Merge pull request #69 from epage/dunce

fix(win): Strip of UNC path pefix
gitext-rs · Mar 16, 2023 · f0af959 · f0af959
2 parents 68e3e98 + 07dac1e
commit f0af959
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -55,6 +55,7 @@ serde = { version = "1.0.152", features = ["derive"] }
 flate2 = "1.0.25"
 once_cell = "1.17.0"
 bugreport = "0.5.0"
+dunce = "1.0.3"
 
 [dev-dependencies]
 snapbox = { version = "0.4.10", features = ["path"] }

diff --git a/src/blame.rs b/src/blame.rs
@@ -171,8 +171,7 @@ fn to_repo_relative(
     let workdir = repo.workdir().ok_or_else(|| {
         anyhow::format_err!("No workdir found; Bare repositories are not supported")
     })?;
-    let abs_path = path
-        .canonicalize()
+    let abs_path = dunce::canonicalize(path)
         .with_context(|| anyhow::format_err!("Could not read {}", path.display()))?;
     let rel_path = abs_path.strip_prefix(workdir).map_err(|_| {
         anyhow::format_err!(