From ce130dcf12e8f1e7a92806f1cbe825692c08d268 Mon Sep 17 00:00:00 2001
From: Kiril Videlov <kiril@videlov.com>
Date: Sun, 7 Jul 2024 16:04:01 +0200
Subject: [PATCH] move normalize_branch_name to core

---
 crates/gitbutler-branch/src/virtual.rs                 | 10 +++-------
 crates/gitbutler-core/src/git/reference/mod.rs         |  6 ++++++
 .../src/git/reference/refname/virtual.rs               |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/gitbutler-branch/src/virtual.rs b/crates/gitbutler-branch/src/virtual.rs
index acc2352b3..e8b6a8891 100644
--- a/crates/gitbutler-branch/src/virtual.rs
+++ b/crates/gitbutler-branch/src/virtual.rs
@@ -16,14 +16,15 @@ use git2::build::TreeUpdateBuilder;
 use git2::ErrorCode;
 use git2_hooks::HookResult;
 use hex::ToHex;
-use regex::Regex;
 use serde::{Deserialize, Serialize};
 
 use gitbutler_core::error::Code;
 use gitbutler_core::error::Marker;
 use gitbutler_core::git::diff::GitHunk;
 use gitbutler_core::git::diff::{diff_files_into_hunks, trees, FileDiff};
-use gitbutler_core::git::{CommitExt, CommitHeadersV2, HasCommitHeaders, RepositoryExt};
+use gitbutler_core::git::{
+    normalize_branch_name, CommitExt, CommitHeadersV2, HasCommitHeaders, RepositoryExt,
+};
 use gitbutler_core::rebase::{cherry_rebase, cherry_rebase_group};
 use gitbutler_core::time::now_since_unix_epoch_ms;
 use gitbutler_core::virtual_branches::branch::HunkHash;
@@ -230,11 +231,6 @@ pub enum NameConflitResolution {
     Overwrite,
 }
 
-pub fn normalize_branch_name(name: &str) -> String {
-    let pattern = Regex::new("[^A-Za-z0-9_/.#]+").unwrap();
-    pattern.replace_all(name, "-").to_string()
-}
-
 pub fn unapply_ownership(
     project_repository: &project_repository::Repository,
     ownership: &BranchOwnershipClaims,
diff --git a/crates/gitbutler-core/src/git/reference/mod.rs b/crates/gitbutler-core/src/git/reference/mod.rs
index e54d68e9b..d0a72bef5 100644
--- a/crates/gitbutler-core/src/git/reference/mod.rs
+++ b/crates/gitbutler-core/src/git/reference/mod.rs
@@ -1,2 +1,8 @@
 mod refname;
 pub use refname::{LocalRefname, Refname, RemoteRefname, VirtualRefname};
+use regex::Regex;
+
+pub fn normalize_branch_name(name: &str) -> String {
+    let pattern = Regex::new("[^A-Za-z0-9_/.#]+").unwrap();
+    pattern.replace_all(name, "-").to_string()
+}
diff --git a/crates/gitbutler-core/src/git/reference/refname/virtual.rs b/crates/gitbutler-core/src/git/reference/refname/virtual.rs
index 43e6a3dde..915d52ca5 100644
--- a/crates/gitbutler-core/src/git/reference/refname/virtual.rs
+++ b/crates/gitbutler-core/src/git/reference/refname/virtual.rs
@@ -3,7 +3,7 @@ use std::{fmt, str::FromStr};
 use serde::{Deserialize, Serialize};
 
 use super::error::Error;
-use crate::virtual_branches::{normalize_branch_name, Branch};
+use crate::{git::normalize_branch_name, virtual_branches::Branch};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Refname {