fix windows test expecations for good (#301)

On windows, there are no symlinks, and we change our expectations
accordingly.

Author: Byron

git-worktree/Cargo.toml

@@ -28,14 +28,14 @@ thiserror = "1.0.26"
 bstr = { version = "0.2.13", default-features = false }
 
 document-features = { version = "0.2.0", optional = true }
-symlink = "0.1.0"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.119"
 
 [dev-dependencies]
 git-testtools = { path = "../tests/tools" }
 git-odb = { path = "../git-odb" }
+symlink = "0.1.0"
 
 walkdir = "2.3.2"
 tempfile = "3.2.0"

git-worktree/src/os.rs

@@ -15,7 +15,6 @@ pub fn remove_symlink(path: &Path) -> io::Result<()> {
 // TODO: use the `symlink` crate once it can delete directory symlinks
 #[cfg(windows)]
 pub fn remove_symlink(path: &Path) -> io::Result<()> {
-    dbg!(path, std::fs::symlink_metadata(path), std::fs::metadata(path));
     if let Ok(meta) = std::fs::metadata(path) {
         if meta.is_file() {
             std::fs::remove_file(path) // this removes the link itself

git-worktree/tests/index/checkout.rs

@@ -235,7 +235,10 @@ fn overwriting_files_and_lone_directories_works() {
     );
 
     let symlink = destination.path().join("dir/sub-dir/symlink");
-    assert!(std::fs::symlink_metadata(&symlink).unwrap().is_symlink(),);
+    assert_eq!(
+        std::fs::symlink_metadata(&symlink).unwrap().is_symlink(),
+        opts.fs.symlink
+    );
     assert_eq!(std::fs::read(symlink).unwrap(), b"other content");
 }
 
@@ -290,16 +293,17 @@ fn keep_going_collects_results() {
             .iter()
             .map(|r| r.path.to_path_lossy().into_owned())
             .collect::<Vec<_>>(),
-        paths(if opts.fs.symlink {
+        paths(if cfg!(unix) {
             ["dir/content", "empty"]
         } else {
-            ["dir/content", "dir/sub-dir/symlink"] // not actually a symlink anymore
+            // not actually a symlink anymore, even though symlinks are supported but git think differently.
+            ["dir/content", "dir/sub-dir/symlink"]
         })
     );
 
     assert_eq!(
         stripped_prefix(&destination, &dir_structure(&destination)),
-        paths(if opts.fs.symlink {
+        paths(if cfg!(unix) {
             ["dir/sub-dir/symlink", "executable"]
         } else {
             ["empty", "executable"]