Refactored code and tests

Author: Limits0x

git-worktree/src/lib.rs

@@ -33,7 +33,7 @@ quick_error! {
             display("IO error while writing blob or reading file metadata or changing filetype: {}", err)
         }
         NotFound(oid: git_hash::ObjectId, path: PathBuf) {
-            display("unable to read sha1 file of {} ({})", path.display(), oid.to_hex())
+            display("unable find object of {} ({})", path.display(), oid.to_hex())
         }
     }
 }
@@ -68,10 +68,10 @@ where
                 let met = file.metadata()?;
                 let ctime = met
                     .created()
-                    .map_or(Ok(Duration::from_secs(0)), |x| x.duration_since(std::time::UNIX_EPOCH));
+                    .map_or(Ok(Duration::default()), |x| x.duration_since(std::time::UNIX_EPOCH));
                 let mtime = met
                     .modified()
-                    .map_or(Ok(Duration::from_secs(0)), |x| x.duration_since(std::time::UNIX_EPOCH));
+                    .map_or(Ok(Duration::default()), |x| x.duration_since(std::time::UNIX_EPOCH));
                 entry_time.push((ctime?, mtime?, i));
             }
             git_index::entry::Mode::SYMLINK => {
@@ -94,10 +94,10 @@ where
                 let met = std::fs::symlink_metadata(&dest)?;
                 let ctime = met
                     .created()
-                    .map_or(Ok(Duration::from_secs(0)), |x| x.duration_since(std::time::UNIX_EPOCH));
+                    .map_or(Ok(Duration::default()), |x| x.duration_since(std::time::UNIX_EPOCH));
                 let mtime = met
                     .modified()
-                    .map_or(Ok(Duration::from_secs(0)), |x| x.duration_since(std::time::UNIX_EPOCH));
+                    .map_or(Ok(Duration::default()), |x| x.duration_since(std::time::UNIX_EPOCH));
                 entry_time.push((ctime?, mtime?, i));
             }
             git_index::entry::Mode::DIR => todo!(),

git-worktree/tests/copy_index/mod.rs

@@ -26,29 +26,24 @@ fn test_copy_index() -> crate::Result<()> {
     let repo_files = dir_structure(&path);
     let copy_files = dir_structure(output);
 
-    let srepo_files: Vec<_> = repo_files.iter().flat_map(|p| p.strip_prefix(&path)).collect();
-    let scopy_files: Vec<_> = copy_files.iter().flat_map(|p| p.strip_prefix(output)).collect();
     assert_eq!(
-        srepo_files,
-        scopy_files,
-        "Testing if {} and {} have the same structure",
-        path.display(),
-        output.display()
+        repo_files
+            .iter()
+            .flat_map(|p| p.strip_prefix(&path))
+            .collect::<Vec<_>>(),
+        copy_files
+            .iter()
+            .flat_map(|p| p.strip_prefix(output))
+            .collect::<Vec<_>>()
     );
 
     for (file1, file2) in repo_files.iter().zip(copy_files.iter()) {
-        assert_eq!(
-            fs::read(file1)?,
-            fs::read(file2)?,
-            "Testing if the contents of {} and {} are the same",
-            file1.display(),
-            file2.display(),
-        );
+        assert_eq!(fs::read(file1)?, fs::read(file2)?);
         #[cfg(unix)]
         assert_eq!(
-            fs::symlink_metadata(file1)?.mode() & 0b111 << 6,
-            fs::symlink_metadata(file2)?.mode() & 0b111 << 6,
-            "Testing if the permissions of {} and {} are the same",
+            fs::symlink_metadata(file1)?.mode() & 0o700,
+            fs::symlink_metadata(file2)?.mode() & 0o700,
+            "Testing if the permissions (normal/executable) of {} and {} are the same",
             file1.display(),
             file2.display(),
         );
@@ -76,39 +71,28 @@ fn test_copy_index_without_symlinks() -> crate::Result<()> {
     let repo_files = dir_structure(&path);
     let copy_files = dir_structure(output);
 
-    let srepo_files: Vec<_> = repo_files.iter().flat_map(|p| p.strip_prefix(&path)).collect();
-    let scopy_files: Vec<_> = copy_files.iter().flat_map(|p| p.strip_prefix(output)).collect();
     assert_eq!(
-        srepo_files,
-        scopy_files,
-        "Testing if {} and {} have the same structure",
-        path.display(),
-        output.display()
+        repo_files
+            .iter()
+            .flat_map(|p| p.strip_prefix(&path))
+            .collect::<Vec<_>>(),
+        copy_files
+            .iter()
+            .flat_map(|p| p.strip_prefix(output))
+            .collect::<Vec<_>>()
     );
 
     for (file1, file2) in repo_files.iter().zip(copy_files.iter()) {
         if file1.is_symlink() {
-            assert!(!file2.is_symlink(), "Testing if the new file is not a symlink");
-            assert_eq!(
-                fs::read(file2)?.to_path()?,
-                fs::read_link(file1)?,
-                "Testing if the {} contains the path the symlink {} is pointing to",
-                file2.display(),
-                file1.display(),
-            );
+            assert!(!file2.is_symlink());
+            assert_eq!(fs::read(file2)?.to_path()?, fs::read_link(file1)?);
         } else {
-            assert_eq!(
-                fs::read(file1)?,
-                fs::read(file2)?,
-                "Testing if the contents of {} and {} are the same",
-                file1.display(),
-                file2.display(),
-            );
+            assert_eq!(fs::read(file1)?, fs::read(file2)?);
             #[cfg(unix)]
             assert_eq!(
-                fs::symlink_metadata(file1)?.mode() & 0b111 << 6,
-                fs::symlink_metadata(file2)?.mode() & 0b111 << 6,
-                "Testing if the permissions of {} and {} are the same",
+                fs::symlink_metadata(file1)?.mode() & 0o700,
+                fs::symlink_metadata(file2)?.mode() & 0o700,
+                "Testing if the permissions (normal/executable) of {} and {} are the same",
                 file1.display(),
                 file2.display(),
             );

git-worktree/tests/fixtures/make_repo.sh

@@ -2,6 +2,7 @@
 set -eu -o pipefail
 
 git init -q
+git config commit.gpgsign false
 
 touch a
 echo "Test Vals" > a