From 0497616cba162ff1dd9030d068caf16aa44bd3d3 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Thu, 8 Oct 2020 01:10:48 +0200 Subject: write_since(): Include TODO lines from untracked files Previously, untracked files were not included in the diff, so TODO lines in those files would not be printed by the program. Add the untracked `DiffOptions` to include the content of these files when searching for TODOs. --- src/lib.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 0fe8f3f..910b488 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,7 +18,7 @@ use std::io::Write; -use git2::{Repository, Tree}; +use git2::{DiffOptions, Repository, Tree}; use thiserror::Error; @@ -46,7 +46,15 @@ impl Todos<'_> { tree: Tree<'_>, write_to: &mut W, ) -> Result<(), Error> { - let diff = self.repo.diff_tree_to_workdir(Some(&tree), None)?; + let mut diff_options = DiffOptions::new(); + diff_options + .show_untracked_content(true) + .recurse_untracked_dirs(true); + + let diff = self.repo.diff_tree_to_workdir_with_index( + Some(&tree), + Some(&mut diff_options), + )?; diff.foreach( &mut |_file, _progress| { -- cgit v1.2.3