gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-29 20:43:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove worktree_path and use workdir function in create_wd_tree

Browse Source
This commit is contained in:
Caleb Owens 2024-09-30 12:27:34 +02:00
parent e4ecddc690
commit 6d52977202
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/gitbutler-repo/src/repository_ext.rs
View File

@ -24,7 +24,6 @@ use tracing::instrument;
///
/// For now, it collects useful methods from `gitbutler-core::git::Repository`
pub trait RepositoryExt {
fn worktree_path(&self) -> PathBuf;
fn signatures(&self) -> Result<(git2::Signature, git2::Signature)>;
fn l(&self, from: git2::Oid, to: LogUntil) -> Result<Vec<git2::Oid>>;
fn list_commits(&self, from: git2::Oid, to: git2::Oid) -> Result<Vec<git2::Commit>>;
@ -164,7 +163,7 @@ impl RepositoryExt for git2::Repository {
fn create_wd_tree(&self) -> Result<Tree> {
let mut tree_update_builder = git2::build::TreeUpdateBuilder::new();
let worktree_path = self.worktree_path();
let worktree_path = self.workdir().context("Could not find worktree path")?;
let statuses = self.statuses(Some(
StatusOptions::new()
@ -211,15 +210,6 @@ impl RepositoryExt for git2::Repository {
Ok(self.find_tree(tree_oid)?)
}
/// Returns the path of the working directory of the repository.
fn worktree_path(&self) -> PathBuf {
if self.is_bare() {
self.path().to_owned()
} else {
self.path().join("..")
}
}
fn workspace_ref_from_head(&self) -> Result<git2::Reference<'_>> {
let head_ref = self.head().context("BUG: head must point to a reference")?;
if head_ref.name_bytes() == b"refs/heads/gitbutler/workspace" {