From 133a286d83c6c940312216832719165c41d8cc3d Mon Sep 17 00:00:00 2001 From: Benjamin Milan Date: Thu, 8 Jan 2026 15:19:24 +0000 Subject: [PATCH] gh18 don't prepend branch prefix if provided --- src/sc/branching/branching.py | 2 ++ src/sc/branching/commands/init.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sc/branching/branching.py b/src/sc/branching/branching.py index 46ddf70..d6d5250 100644 --- a/src/sc/branching/branching.py +++ b/src/sc/branching/branching.py @@ -166,6 +166,8 @@ def create_branch( name: str | None = None ) -> Branch: if name: + if name.startswith(f"{branch_type}/"): + name = name.split("/", 1)[1] return Branch(branch_type, name) if branch_type in {BranchType.DEVELOP, BranchType.MASTER}: diff --git a/src/sc/branching/commands/init.py b/src/sc/branching/commands/init.py index 71fa3ca..58d8cf7 100644 --- a/src/sc/branching/commands/init.py +++ b/src/sc/branching/commands/init.py @@ -25,7 +25,8 @@ @dataclass class Init(Command): def run_git_command(self): - GitFlowLibrary.init(self.top_dir) + if not GitFlowLibrary.is_gitflow_enabled(self.top_dir): + GitFlowLibrary.init(self.top_dir) def run_repo_command(self): Init.init_gitflow_for_manifest(self.top_dir)