Showing the changes to git-worktree/src (1 of 58 files). Show all
Unified · Split
| @@ -102,10 +102,10 @@ impl Ignore { · 101 unmodified lines | |||
| 102 | if mapping.pattern.is_negative() { | 102 | if mapping.pattern.is_negative() { |
| 103 | dir_match = Some(match_); | 103 | dir_match = Some(match_); |
| 104 | } else { | 104 | } else { |
| 105 | // Note that returning here is wrong if this pattern _was_ preceeded by a negative pattern that | 105 | // Note that returning here is wrong if this pattern _was_ preceded by a negative pattern that |
| 106 | // didn't match the directory, but would match now. | 106 | // didn't match the directory, but would match now. |
| 107 | // Git does it similarly so we do too even though it's incorrect. | 107 | // Git does it similarly so we do too even though it's incorrect. |
| 108 | // To fix this, one would probably keep track of whether there was a preceeding negative pattern, and | 108 | // To fix this, one would probably keep track of whether there was a preceding negative pattern, and |
| 109 | // if so we check the path in full and only use the dir match if there was no match, similar to the negative | 109 | // if so we check the path in full and only use the dir match if there was no match, similar to the negative |
| 110 | // case above whose fix fortunately won't change the overall result. | 110 | // case above whose fix fortunately won't change the overall result. |
| 111 | return match_.into(); | 111 | return match_.into(); |