Allow dots in base branch names by nkoshell · Pull Request #94 · gittower/git-flow-next

nkoshell · 2026-03-31T10:42:03Z

Allow dots in base branch names.

Before changes:

Shell output for branch with dots

/ $ mkdir -p /tmp/git-flow-check
/ $ cd /tmp/git-flow-check/
/tmp/git-flow-check $ git init
/tmp/git-flow-check $ git-flow init --preset=classic --main=custom.main --develop=custom.dev
Initializing git-flow with classic preset
Created branch 'custom.main'
Created branch 'custom.dev'
Git flow has been initialized
/tmp/git-flow-check $ git-flow overview
Base branches:
==============

Topic branch types:
===================
bugfix/*:
  Parent: custom.dev
  Merges into custom.dev, Rebases onto from custom.dev

release/*:
  Parent: custom.main
  Start point: custom.dev
  Merges into custom.main, Merges from custom.main
  Creates tags on finish

hotfix/*:
  Parent: custom.main
  Merges into custom.main, Rebases onto from custom.main
  Creates tags on finish

support/*:
  Parent: custom.main
  none into custom.main, none from custom.main

feature/*:
  Parent: custom.dev
  Merges into custom.dev, Rebases onto from custom.dev

Active topic branches:
======================
  No active topic branches

After changes:

Shell output for branch with dots

/ $ mkdir -p /tmp/git-flow-check
/ $ cd /tmp/git-flow-check/
/tmp/git-flow-check $ git init
/tmp/git-flow-check $ git-flow init --preset=classic --main=custom.main --develop=custom.dev
Initializing git-flow with classic preset
Created branch 'custom.main'
Created branch 'custom.dev'
Git flow has been initialized
/tmp/git-flow-check $ git-flow overview
Base branches:
==============
  custom.main (root)
  custom.dev → custom.main [auto-update]

Topic branch types:
===================
feature/*:
  Parent: custom.dev
  Merges into custom.dev, Rebases onto from custom.dev

bugfix/*:
  Parent: custom.dev
  Merges into custom.dev, Rebases onto from custom.dev

release/*:
  Parent: custom.main
  Start point: custom.dev
  Merges into custom.main, Merges from custom.main
  Creates tags on finish

hotfix/*:
  Parent: custom.main
  Merges into custom.main, Rebases onto from custom.main
  Creates tags on finish

support/*:
  Parent: custom.main
  none into custom.main, none from custom.main

Active topic branches:
======================
  No active topic branches

Resolves #93

Copilot

Pull request overview

Updates git-flow-next configuration loading so base branch names containing dots (e.g., custom.main) are correctly parsed from git config, addressing Issue #93 where git-flow overview didn’t recognize such branches.

Changes:

Adjusted LoadConfig() parsing of gitflow.branch.* keys to treat everything between gitflow.branch. and the final segment as the branch name (allowing embedded dots).
Added a unit test for config.ApplyOverrides() to verify overridden base branch names containing dots propagate through derived branch settings.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
`internal/config/config.go`	Fixes parsing of `gitflow.branch.<branch>.<property>` when `<branch>` includes dots.
`test/internal/config/config_test.go`	Adds coverage for override logic with dotted `MainBranch` / `DevelopBranch` values.

Copilot · 2026-04-06T09:52:57Z

+			branchName := strings.ToLower(strings.Join(keyParts[2:len(keyParts)-1], "."))
+			property := strings.ToLower(keyParts[len(keyParts)-1])


The updated LoadConfig parsing now supports branch names that contain dots, but there’s no regression test that exercises reading such keys from git config (e.g., gitflow.branch.custom.main.type). The new unit test only covers ApplyOverrides, which doesn’t validate the git config --get-regexp gitflow\.branch\. parsing logic; please add a test that writes dotted branch keys into a temp repo and asserts config.LoadConfig() (or git-flow overview) recognizes the base branches correctly.

Copilot · 2026-04-06T09:52:57Z

@@ -270,6 +270,58 @@ func TestApplyOverrides_CustomBranchNames(t *testing.T) {
 	assert.False(t, exists)
 }



This new test is missing the standard structured header comment used across the test suite (summary line + // Steps: list). Adding it will make the intent and setup steps consistent with the rest of the repo’s tests.

Suggested change

// TestApplyOverrides_CustomBranchNamesWithDots validates that ApplyOverrides

// correctly updates branch relationships when custom branch names contain dots.

// Steps:

// 1. Create the default configuration.

// 2. Apply overrides using dotted names for the main and develop branches.

// 3. Verify the renamed base branches have the expected type, parent, and start point.

// 4. Verify dependent branch types reference the updated dotted branch names.

// 5. Verify the original default branch names no longer exist in the configuration.

alexrinass

Clean, minimal fix for a real parsing bug — the approach of joining middle key parts for the branch name and taking the last part as the property is correct. However, the test doesn't exercise the actual code path that was changed.

Must Fix

Test doesn't cover the fix — test/internal/config/config_test.go:273 — TestApplyOverrides_CustomBranchNamesWithDots tests ApplyOverrides, but the code change is in LoadConfig. A dotted branch name passed through ApplyOverrides already worked (it's just a map key). The fix needs a LoadConfig-level test that sets git config keys like gitflow.branch.custom.main.type and verifies they parse correctly.

Nit

Stale comment — internal/config/config.go:231 — The comment // Parse key: gitflow.branch.<branchname>.<property> should note that <branchname> may contain dots.

🤖 Review generated with Claude Code

alexrinass · 2026-04-06T10:23:47Z

@@ -270,6 +270,58 @@ func TestApplyOverrides_CustomBranchNames(t *testing.T) {
 	assert.False(t, exists)
 }



This test only exercises ApplyOverrides, not LoadConfig where the parsing fix actually lives. ApplyOverrides already handled dotted names correctly since it just renames map keys.

Add a TestLoadConfigWithDottedBranchNames test (similar to TestLoadConfigCaseInsensitive at line 54) that:

Sets up a test repo

Runs git config gitflow.branch.custom.main.type base (and other properties)

Calls config.LoadConfig()

Asserts the branch appears as custom.main in the loaded config

alexrinass · 2026-04-06T10:23:47Z

-			branchName := strings.ToLower(keyParts[2])
-			property := strings.ToLower(keyParts[3])
+			branchName := strings.ToLower(strings.Join(keyParts[2:len(keyParts)-1], "."))
+			property := strings.ToLower(keyParts[len(keyParts)-1])


The fix is correct. Minor: the comment on line 231 above (// Parse key: gitflow.branch.<branchname>.<property>) should be updated to reflect that <branchname> may contain dots.

nkoshell force-pushed the feature/dots-in-base-branch-names branch from d0f543c to 752c1f0 Compare March 31, 2026 10:53

feat: Allow dots in base branch names

96c19d6

nkoshell force-pushed the feature/dots-in-base-branch-names branch from 752c1f0 to 96c19d6 Compare March 31, 2026 11:10

alexrinass requested a review from Copilot April 6, 2026 09:49

Copilot started reviewing on behalf of alexrinass April 6, 2026 09:49 View session

Copilot AI reviewed Apr 6, 2026

View reviewed changes

alexrinass requested changes Apr 6, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow dots in base branch names#94

Allow dots in base branch names#94
nkoshell wants to merge 1 commit intogittower:mainfrom
nkoshell:feature/dots-in-base-branch-names

nkoshell commented Mar 31, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 6, 2026

Uh oh!

Copilot AI Apr 6, 2026

Uh oh!

alexrinass left a comment •

edited

Loading

Uh oh!

alexrinass Apr 6, 2026

Uh oh!

alexrinass Apr 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		branchName := strings.ToLower(strings.Join(keyParts[2:len(keyParts)-1], "."))
		property := strings.ToLower(keyParts[len(keyParts)-1])

		@@ -270,6 +270,58 @@ func TestApplyOverrides_CustomBranchNames(t *testing.T) {
		assert.False(t, exists)
		}

+// TestApplyOverrides_CustomBranchNamesWithDots validates that ApplyOverrides
+// correctly updates branch relationships when custom branch names contain dots.
+// Steps:
+// 1. Create the default configuration.
+// 2. Apply overrides using dotted names for the main and develop branches.
+// 3. Verify the renamed base branches have the expected type, parent, and start point.
+// 4. Verify dependent branch types reference the updated dotted branch names.
+// 5. Verify the original default branch names no longer exist in the configuration.

Conversation

nkoshell commented Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!