Skip to content

armgit / agtx

Public Imported from GitHub
0

πŸ„πŸΌβ€β™‚οΈ The blackboard for coding agents - agentic development environment for claude code, codex, cursor, opencode, grok and more.

refactor: main branch detection

fynnfluegge24f8ffebea00
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 25c4a42..51f8e8f 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -163,8 +163,8 @@ pub struct WorktreeConfig {
#[serde(default = "default_true")]
pub auto_cleanup: bool,
- /// Base branch to create worktrees from
- #[serde(default = "default_base_branch")]
+ /// Base branch to create worktrees from (empty = auto-detect main/master)
+ #[serde(default)]
pub base_branch: String,
}
@@ -173,7 +173,7 @@ impl Default for WorktreeConfig {
Self {
enabled: true,
auto_cleanup: true,
- base_branch: "main".to_string(),
+ base_branch: String::new(),
}
}
}
@@ -182,10 +182,6 @@ fn default_true() -> bool {
true
}
-fn default_base_branch() -> String {
- "main".to_string()
-}
-
/// Project-specific configuration (stored in .agtx/config.toml)
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct ProjectConfig {
diff --git a/tests/config_tests.rs b/tests/config_tests.rs
index aab78f1..7e51bb5 100644
--- a/tests/config_tests.rs
+++ b/tests/config_tests.rs
@@ -54,7 +54,7 @@ fn test_global_config_default() {
assert_eq!(config.default_agent, "claude");
assert!(config.worktree.enabled);
assert!(config.worktree.auto_cleanup);
- assert_eq!(config.worktree.base_branch, "main");
+ assert_eq!(config.worktree.base_branch, "");
}
// === WorktreeConfig Tests ===
@@ -65,7 +65,7 @@ fn test_worktree_config_default() {
assert!(config.enabled);
assert!(config.auto_cleanup);
- assert_eq!(config.base_branch, "main");
+ assert_eq!(config.base_branch, "");
}
// === ProjectConfig Tests ===
@@ -91,7 +91,7 @@ fn test_merged_config_uses_global_defaults() {
let merged = MergedConfig::merge(&global, &project);
assert_eq!(merged.default_agent, "claude");
- assert_eq!(merged.base_branch, "main");
+ assert_eq!(merged.base_branch, "");
assert!(merged.worktree_enabled);
assert!(merged.auto_cleanup);
assert!(merged.copy_files.is_none());