prepare checkout, but needs to be able to create an index from a tree (…

…#450)
Byron · Oct 14, 2022 · e462bd5 · e462bd5
1 parent 458e1bc
commit e462bd5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/git-repository/src/clone/checkout.rs b/git-repository/src/clone/checkout.rs
@@ -31,7 +31,30 @@ pub mod main_worktree {
             let _workdir = repo.work_dir().ok_or_else(|| Error::BareRepository {
                 git_dir: repo.git_dir().to_owned(),
             })?;
-
+            let _index_path = repo.index_path();
+            //     git_worktree::index::checkout(
+            //     &mut index,
+            //     workdir,
+            //     {
+            //         let objects = repo.objects.into_arc()?;
+            //         move |oid, buf| {
+            //             objects.find_blob(oid, buf).ok();
+            //             if empty_files {
+            //                 // We always want to query the ODB here…
+            //                 objects.find_blob(oid, buf)?;
+            //                 buf.clear();
+            //                 // …but write nothing
+            //                 Ok(git::objs::BlobRef { data: buf })
+            //             } else {
+            //                 objects.find_blob(oid, buf)
+            //             }
+            //         }
+            //     },
+            //     &mut files,
+            //     &mut bytes,
+            //     should_interrupt,
+            //     opts,
+            // );
             todo!("which branch to use?")
         }
     }

diff --git a/git-repository/tests/clone/mod.rs b/git-repository/tests/clone/mod.rs
@@ -66,7 +66,16 @@ fn fetch_and_checkout() -> crate::Result {
     let mut prepare = git::prepare_clone_bare(remote::repo("base").path(), tmp.path())?;
     let (mut checkout, _out) =
         prepare.fetch_then_checkout(git::progress::Discard, &std::sync::atomic::AtomicBool::default())?;
-    checkout.main_worktree(git::progress::Discard, &std::sync::atomic::AtomicBool::default())?;
+    let repo = checkout.main_worktree(git::progress::Discard, &std::sync::atomic::AtomicBool::default())?;
+
+    let index = repo.index()?;
+    assert_eq!(index.entries().len(), 42, "All entries are known as per HEAD tree");
+
+    let work_dir = repo.work_dir().expect("non-bare");
+    for entry in index.entries() {
+        let entry_path = work_dir.join(git_path::from_bstr(entry.path(&index)));
+        assert!(entry_path.is_file(), "{:?} not found on disk", entry_path)
+    }
     Ok(())
 }