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

Compute pathspec from absolute.strip_prefix(workdir)

This commit is contained in:
sharkdp 2018-05-06 11:04:44 +02:00
parent a424003169
commit 3a6a161cfd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@ -230,16 +230,12 @@ fn print_file<P: AsRef<Path>>(
}
fn get_git_diff(filename: &str) -> Option<LineChanges> {
let repo = Repository::discover(Path::new(&filename)).ok()?;
let workdir = repo.workdir()?;
let absolute_file_path = workdir.join(Path::new(&filename));
let relative_file_path = absolute_file_path.strip_prefix(workdir).ok()?;
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 mut diff_options = DiffOptions::new();
let pathspec = format!("*{}", relative_file_path.display())
.into_c_string()
.ok()?;
// GIT pathspec uses relative path
let pathspec = path_relative_to_repo.into_c_string().ok()?;
diff_options.pathspec(pathspec);
diff_options.context_lines(0);
@ -261,7 +257,7 @@ fn get_git_diff(filename: &str) -> Option<LineChanges> {
Some(&mut |delta, hunk| {
let path = delta.new_file().path().unwrap_or_else(|| Path::new(""));
if relative_file_path != path {
if path_relative_to_repo != path {
return false;
}