Unified · Split
| @@ -76,10 +76,10 @@ fn absolute_worktree_dir_with_os_separators_matches_with_trailing_glob() -> crat · 75 unmodified lines | |||
| 76 | 76 | ||
| 77 | #[test] | 77 | #[test] |
| 78 | fn dot_slash_path_is_replaced_with_directory_containing_the_including_config_file() -> crate::Result { | 78 | fn dot_slash_path_is_replaced_with_directory_containing_the_including_config_file() -> crate::Result { |
| 79 | // TODO: understand this | ||
| 80 | assert_section_value( | 79 | assert_section_value( |
| 81 | Condition::new("gitdir:./").set_user_config_instead_of_repo_config(), | 80 | Condition::new("gitdir:./").set_user_config_instead_of_repo_config(), |
| 82 | GitEnv::repo_name("worktree")?, | 81 | GitEnv::repo_name("worktree")?, |
| 82 | // the user configuration is in $HOME, which is parent to $HOME/worktree, and the pattern path ends up being $HOME/**, including worktree/.git | ||
| 83 | ) | 83 | ) |
| 84 | } | 84 | } |
| 85 | 85 | ||
| @@ -160,13 +160,8 @@ fn dot_dot_slash_prefixes_are_not_special_and_are_not_what_you_want() -> crate:: · 74 unmodified lines | |||
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | #[test] | 162 | #[test] |
| 163 | #[ignore] | ||
| 164 | fn leading_dots_are_not_special() -> crate::Result { | 163 | fn leading_dots_are_not_special() -> crate::Result { |
| 165 | // TODO: write this test so that it could fail - right now it's naturally correct | 164 | assert_section_value(Condition::new("gitdir:.hidden/"), GitEnv::repo_name(".hidden")?) |
| 166 | assert_section_value( | ||
| 167 | Condition::new("gitdir:.hidden/").expect_original_value(), | ||
| 168 | GitEnv::repo_name(".hidden")?, | ||
| 169 | ) | ||
| 170 | } | 165 | } |
| 171 | 166 | ||
| 172 | #[test] | 167 | #[test] |
| @@ -219,7 +214,7 @@ fn star_star_in_the_middle() -> crate::Result { · 46 unmodified lines | |||
| 219 | #[cfg(not(windows))] | 214 | #[cfg(not(windows))] |
| 220 | fn tilde_expansion_with_symlink() -> crate::Result { | 215 | fn tilde_expansion_with_symlink() -> crate::Result { |
| 221 | let env = util::git_env_with_symlinked_repo()?; | 216 | let env = util::git_env_with_symlinked_repo()?; |
| 222 | assert_section_value(Condition::new("gitdir:~/symlink-worktree/"), env) | 217 | assert_section_value(Condition::new("gitdir:~/worktree/"), env) |
| 223 | } | 218 | } |
| 224 | 219 | ||
| 225 | #[test] | 220 | #[test] |