try to fix windows once again (#301)

Author: Byron

git-worktree/src/os.rs

@@ -12,10 +12,19 @@ pub fn remove_symlink(path: &Path) -> io::Result<()> {
     std::fs::remove_file(path)
 }
 
+// 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));
-    symlink::remove_symlink_auto(path)
+    if let Ok(meta) = std::fs::metadata(path) {
+        if meta.is_file() {
+            std::fs::remove_file(path) // this removes the link itself
+        } else {
+            std::fs::remove_dir(path) // however, this sees the destination directory, which isn't the right thing actually
+        }
+    } else {
+        std::fs::remove_file(path).or_else(|_| std::fs::remove_dir(path))
+    }
 }
 
 #[cfg(windows)]

git-worktree/tests/index/checkout.rs

@@ -58,7 +58,7 @@ mod cache {
         symlink::symlink_dir(&forbidden, tmp.path().join("link-to-dir")).unwrap();
         std::fs::write(tmp.path().join("file-in-dir"), &[]).unwrap();
 
-        for dirname in &["link-to-dir", "file-in-dir"] {
+        for dirname in &["file-in-dir", "link-to-dir"] {
             cache.unlink_on_collision = false;
             let relative_path = format!("{}/file", dirname);
             assert_eq!(
@@ -284,35 +284,26 @@ fn keep_going_collects_results() {
     )
     .unwrap();
 
-    assert_eq!(
-        outcome
-            .errors
-            .iter()
-            .map(
-                |r| r.error.to_string()[.."object 4f41554f6e0045ef53848fc0c3f33b6a9abc24a9 for checkout at ".len()]
-                    .to_owned()
-            )
-            .collect::<Vec<_>>(),
-        [
-            "4f41554f6e0045ef53848fc0c3f33b6a9abc24a9",
-            "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"
-        ]
-        .iter()
-        .map(|id| format!("object {} for checkout at ", id))
-        .collect::<Vec<_>>()
-    );
     assert_eq!(
         outcome
             .errors
             .iter()
             .map(|r| r.path.to_path_lossy().into_owned())
             .collect::<Vec<_>>(),
-        paths(["dir/content", "empty"])
+        paths(if opts.fs.symlink {
+            ["dir/content", "empty"]
+        } else {
+            ["dir/content", "dir/sub-dir/symlink"] // not actually a symlink anymore
+        })
     );
 
     assert_eq!(
         stripped_prefix(&destination, &dir_structure(&destination)),
-        paths(["dir/sub-dir/symlink", "executable"]),
+        paths(if opts.fs.symlink {
+            ["dir/sub-dir/symlink", "executable"]
+        } else {
+            ["empty", "executable"]
+        }),
         "some files could not be created"
     );