Make destination_must_be_empty default to true

Author: j-walther

gix/src/create.rs

@@ -108,7 +108,7 @@ fn create_dir(p: &Path) -> Result<(), Error> {
 }
 
 /// Options for use in [`into()`];
-#[derive(Copy, Clone, Default)]
+#[derive(Copy, Clone)]
 pub struct Options {
     /// If true, and the kind of repository to create has a worktree, then the destination directory must be empty.
     ///
@@ -119,6 +119,15 @@ pub struct Options {
     pub fs_capabilities: Option<gix_fs::Capabilities>,
 }
 
+impl Default for Options {
+    fn default() -> Self {
+        Options {
+            destination_must_be_empty: true,
+            fs_capabilities: None,
+        }
+    }
+}
+
 /// Create a new `.git` repository of `kind` within the possibly non-existing `directory`
 /// and return its path.
 /// Note that this is a simple template-based initialization routine which should be accompanied with additional corrections

gix/src/lib.rs

@@ -293,7 +293,15 @@ pub fn open_with_environment_overrides(directory: impl Into<std::path::PathBuf>)
 /// ```
 #[allow(clippy::result_large_err)]
 pub fn init(directory: impl AsRef<std::path::Path>) -> Result<Repository, init::Error> {
-    ThreadSafeRepository::init(directory, create::Kind::WithWorktree, create::Options::default()).map(Into::into)
+    ThreadSafeRepository::init(
+        directory,
+        create::Kind::WithWorktree,
+        create::Options {
+            destination_must_be_empty: false,
+            ..Default::default()
+        },
+    )
+    .map(Into::into)
 }
 
 /// See [`ThreadSafeRepository::init()`], but returns a [`Repository`] instead.

gix/tests/gix/clone.rs

@@ -552,7 +552,7 @@ mod blocking_io {
     }
 
     #[test]
-    fn fetch_and_checkout_into_non_empty_directory_is_allowed_by_default() -> crate::Result {
+    fn fetch_and_checkout_into_non_empty_directory() -> crate::Result {
         let tmp = gix_testtools::tempfile::TempDir::new()?;
         let existing_path = tmp.path().join("existing.txt");
         let existing_content = b"I was here before you";
@@ -562,7 +562,10 @@ mod blocking_io {
             remote::repo("base").path(),
             tmp.path(),
             gix::create::Kind::WithWorktree,
-            Default::default(),
+            gix::create::Options {
+                destination_must_be_empty: false,
+                ..Default::default()
+            },
             restricted(),
         )?;
         let (mut checkout, _out) =
@@ -835,10 +838,7 @@ fn clone_with_worktree_and_destination_must_be_empty() -> crate::Result {
         remote::repo("base").path(),
         tmp.path(),
         gix::create::Kind::WithWorktree,
-        gix::create::Options {
-            destination_must_be_empty: true,
-            ..Default::default()
-        },
+        Default::default(),
         restricted(),
     ) {
         Ok(_) => unreachable!("this should fail as the directory isn't empty"),