fix: don't allow non-bare repositories to be initialized into non-emp…

…ty directories. (#450)
Byron · Oct 17, 2022 · f869b22 · f869b22
1 parent bc5e3e4
commit f869b22
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/git-repository/src/create.rs b/git-repository/src/create.rs
@@ -118,26 +118,25 @@ pub fn into(
     Options { bare, fs_capabilities }: Options,
 ) -> Result<git_discover::repository::Path, Error> {
     let mut dot_git = directory.into();
+    if fs::read_dir(&dot_git)
+        .or_else(|err| {
+            if err.kind() == std::io::ErrorKind::NotFound {
+                fs::create_dir(&dot_git).and_then(|_| fs::read_dir(&dot_git))
+            } else {
+                Err(err)
+            }
+        })
+        .map_err(|err| Error::IoOpen {
+            source: err,
+            path: dot_git.clone(),
+        })?
+        .count()
+        != 0
+    {
+        return Err(Error::DirectoryNotEmpty { path: dot_git });
+    }
 
-    if bare {
-        if fs::read_dir(&dot_git)
-            .or_else(|err| {
-                if err.kind() == std::io::ErrorKind::NotFound {
-                    fs::create_dir(&dot_git).and_then(|_| fs::read_dir(&dot_git))
-                } else {
-                    Err(err)
-                }
-            })
-            .map_err(|err| Error::IoOpen {
-                source: err,
-                path: dot_git.clone(),
-            })?
-            .count()
-            != 0
-        {
-            return Err(Error::DirectoryNotEmpty { path: dot_git });
-        }
-    } else {
+    if !bare {
         dot_git.push(DOT_GIT_DIR);
 
         if dot_git.is_dir() {

diff --git a/git-repository/tests/init/mod.rs b/git-repository/tests/init/mod.rs
@@ -87,11 +87,15 @@ mod non_bare {
     }
 
     #[test]
-    fn init_into_non_empty_directory_is_allowed() -> crate::Result {
+    fn init_into_non_empty_directory_is_not_allowed() -> crate::Result {
         let tmp = tempfile::tempdir()?;
         std::fs::write(tmp.path().join("existing.txt"), b"I was here before you")?;
 
-        git_repository::init(tmp.path())?;
+        assert!(git_repository::init(tmp.path())
+            .unwrap_err()
+            .to_string()
+            .starts_with("Refusing to initialize the non-empty directory as"));
+
         Ok(())
     }
 }