Merge pull request #5100 from Byron/fix-5099

fix 5099

Author: Byron

Cargo.lock

@@ -41,7 +41,7 @@ resolver = "2"
 [workspace.dependencies]
 bstr = "1.10.0"
 # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
-gix = { git = "https://github.com/Byron/gitoxide", rev = "72daa46bad9d397ef2cc48a3cffda23f414ccd8a", default-features = false, features = [
+gix = { git = "https://github.com/Byron/gitoxide", rev = "64872690e60efdd9267d517f4d9971eecd3b875c", default-features = false, features = [
 ] }
 git2 = { version = "0.19.0", features = [
     "vendored-openssl",

Cargo.toml

@@ -13,7 +13,7 @@ use gitbutler_repo::{GixRepositoryExt, RepositoryExt as _};
 use gitbutler_serde::BStringForFrontend;
 use gitbutler_stack::{Stack as GitButlerBranch, StackId, Target};
 use gix::object::tree::diff::Action;
-use gix::prelude::ObjectIdExt;
+use gix::prelude::{ObjectIdExt, TreeDiffChangeExt};
 use gix::reference::Category;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
@@ -598,7 +598,9 @@ pub fn get_branch_listing_details(
             };
             base_tree
                 .changes()?
-                .track_rewrites(None)
+                .options(|opts| {
+                    opts.track_rewrites(None);
+                })
                 // NOTE: `stats(head_tree)` is also possible, but we have a separate thread for that.
                 .for_each_to_obtain_tree(&head_tree, move |change| -> anyhow::Result<Action> {
                     change_tx.send(change.detach()).ok();

crates/gitbutler-branch-actions/src/branch.rs

@@ -23,10 +23,6 @@ resolve-path = "0.1.0"
 # for locking
 fslock = "0.2.1"
 
-[[test]]
-name="project"
-path = "tests/mod.rs"
-
 [dev-dependencies]
 gitbutler-testsupport.workspace = true
 tempfile = "3.13"

crates/gitbutler-project/Cargo.toml

@@ -45,7 +45,16 @@ impl Controller {
                     bail!("can only work in main worktrees");
                 };
             }
-            Ok(_repo) => {}
+            Ok(repo) => {
+                match repo.work_dir() {
+                    None => bail!("Cannot add non-bare repositories without a workdir"),
+                    Some(wd) => {
+                        if !wd.join(".git").is_dir() {
+                            bail!("A git-repository without a `.git` directory cannot currently be added");
+                        }
+                    }
+                }
+            }
             Err(err) => {
                 return Err(anyhow::Error::from(err))
                     .context(error::Context::new("must be a Git repository"));

crates/gitbutler-project/src/controller.rs

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -eu -o pipefail
+
+git init simple
+(cd simple
+  >file && git add file && git commit -m "init"
+)
+
+git clone simple submodule
+
+git clone simple with-submodule
+(cd with-submodule
+  git submodule add ../submodule
+  git commit -m "add submodule"
+)
+
+git clone --bare simple non-bare-without-worktree
+(cd non-bare-without-worktree
+  git config core.bare false
+)

crates/gitbutler-project/tests/fixtures/various-repositories.sh

@@ -23,6 +23,29 @@ mod add {
 
     mod error {
         use super::*;
+        use std::path::PathBuf;
+
+        #[test]
+        fn non_bare_without_worktree() {
+            let (controller, _tmp) = new();
+            let root = repo_path_at("non-bare-without-worktree");
+            let err = controller.add(root).unwrap_err();
+            assert_eq!(
+                err.to_string(),
+                "Cannot add non-bare repositories without a workdir"
+            );
+        }
+
+        #[test]
+        fn submodule() {
+            let (controller, _tmp) = new();
+            let root = repo_path_at("with-submodule").join("submodule");
+            let err = controller.add(root).unwrap_err();
+            assert_eq!(
+                err.to_string(),
+                "A git-repository without a `.git` directory cannot currently be added"
+            );
+        }
 
         #[test]
         fn missing() {
@@ -113,6 +136,14 @@ mod add {
             )
             .unwrap()
         }
+
+        fn repo_path_at(name: &str) -> PathBuf {
+            gitbutler_testsupport::gix_testtools::scripted_fixture_read_only(
+                "various-repositories.sh",
+            )
+            .unwrap()
+            .join(name)
+        }
     }
 }
 

crates/gitbutler-project/tests/mod.rs

@@ -1,6 +1,11 @@
 #![forbid(rust_2018_idioms)]
 pub const VAR_NO_CLEANUP: &str = "GITBUTLER_TESTS_NO_CLEANUP";
 
+/// Direct access to lower-level utilities for cases where this is enough.
+///
+/// Prefer to use [`read_only`] and [`writable`] otherwise.
+pub use gix_testtools;
+
 mod test_project;
 pub use test_project::TestProject;