Showing the changes to git-worktree/src (1 of 100 files). Show all
Unified · Split
| @@ -231,10 +231,10 @@ impl State { · 230 unmodified lines | |||
| 231 | /// - ignores entries which aren't blobs | 231 | /// - ignores entries which aren't blobs |
| 232 | /// - ignores ignore entries which are not skip-worktree | 232 | /// - ignores ignore entries which are not skip-worktree |
| 233 | /// - within merges, picks 'our' stage both for ignore and attribute files. | 233 | /// - within merges, picks 'our' stage both for ignore and attribute files. |
| 234 | pub fn build_attribute_list<'paths>( | 234 | pub fn build_attribute_list( |
| 235 | &self, | 235 | &self, |
| 236 | index: &git_index::State, | 236 | index: &git_index::State, |
| 237 | paths: &'paths git_index::PathStorageRef, | 237 | paths: &git_index::PathStorageRef, |
| 238 | case: Case, | 238 | case: Case, |
| 239 | ) -> Vec<PathOidMapping> { | 239 | ) -> Vec<PathOidMapping> { |
| 240 | let a1_backing; | 240 | let a1_backing; |