diff --git a/crates/gitbutler-branch/src/base.rs b/crates/gitbutler-branch/src/base.rs index 885e15d35..9e699db69 100644 --- a/crates/gitbutler-branch/src/base.rs +++ b/crates/gitbutler-branch/src/base.rs @@ -5,11 +5,11 @@ use git2::Index; use serde::Serialize; use gitbutler_core::virtual_branches::integration::{ - get_workspace_head, update_gitbutler_integration, GITBUTLER_INTEGRATION_REFERENCE, + get_workspace_head, update_gitbutler_integration, }; use gitbutler_core::virtual_branches::{ branch, convert_to_real_branch, target, BranchId, RemoteCommit, VirtualBranchHunk, - VirtualBranchesHandle, + VirtualBranchesHandle, GITBUTLER_INTEGRATION_REFERENCE, }; use gitbutler_core::{error::Marker, git::RepositoryExt, rebase::cherry_rebase}; use gitbutler_core::{ diff --git a/crates/gitbutler-core/src/virtual_branches/integration.rs b/crates/gitbutler-core/src/virtual_branches/integration.rs index ca4623262..9cebc7400 100644 --- a/crates/gitbutler-core/src/virtual_branches/integration.rs +++ b/crates/gitbutler-core/src/virtual_branches/integration.rs @@ -2,22 +2,16 @@ use std::{path::PathBuf, vec}; use anyhow::{anyhow, bail, Context, Result}; use bstr::ByteSlice; -use lazy_static::lazy_static; -use super::VirtualBranchesHandle; +use super::{VirtualBranchesHandle, GITBUTLER_INTEGRATION_REFERENCE}; use crate::error::Marker; use crate::git::RepositoryExt; use crate::{ - git::{self, CommitExt}, + git::CommitExt, project_repository::{self, conflicts, LogUntil}, virtual_branches::branch::BranchCreateRequest, }; -lazy_static! { - pub static ref GITBUTLER_INTEGRATION_REFERENCE: git::LocalRefname = - git::LocalRefname::new("gitbutler/integration", None); -} - const WORKSPACE_HEAD: &str = "Workspace Head"; pub const GITBUTLER_INTEGRATION_COMMIT_AUTHOR_NAME: &str = "GitButler"; pub const GITBUTLER_INTEGRATION_COMMIT_AUTHOR_EMAIL: &str = "gitbutler@gitbutler.com"; diff --git a/crates/gitbutler-core/src/virtual_branches/mod.rs b/crates/gitbutler-core/src/virtual_branches/mod.rs index c512dba2f..45d95e3c5 100644 --- a/crates/gitbutler-core/src/virtual_branches/mod.rs +++ b/crates/gitbutler-core/src/virtual_branches/mod.rs @@ -6,7 +6,6 @@ mod files; pub use files::*; pub mod integration; -pub use integration::GITBUTLER_INTEGRATION_REFERENCE; mod r#virtual; pub use r#virtual::*; @@ -20,3 +19,9 @@ pub use state::VirtualBranchesHandle; mod author; pub use author::Author; + +use lazy_static::lazy_static; +lazy_static! { + pub static ref GITBUTLER_INTEGRATION_REFERENCE: crate::git::LocalRefname = + crate::git::LocalRefname::new("gitbutler/integration", None); +}