Rename --base flag to --branch on worktree add

The --base flag was ambiguous — it serves as either a branch to check
out from the remote or the starting point for a new branch. Rename to
--branch which better reflects that worktree add always deals with
branches, not arbitrary refs or commits.

Also renames the environment variable from LOKI_WORKTREE_BASE to
LOKI_WORKTREE_BRANCH for consistency.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: dggsax

src/main.rs

@@ -33,7 +33,7 @@ fn styles() -> clap::builder::Styles {
         .placeholder(AnsiColor::Cyan.on_default())
 }
 
-use vars::{LOKI_NEW_PREFIX, LOKI_REBASE_TARGET, LOKI_WORKTREE_BASE, NO_HOOKS};
+use vars::{LOKI_NEW_PREFIX, LOKI_REBASE_TARGET, LOKI_WORKTREE_BRANCH, NO_HOOKS};
 
 #[derive(Debug, Parser)]
 struct CommitOptions {
@@ -105,9 +105,10 @@ enum WorktreeSubcommand {
         #[clap(long, env = LOKI_NEW_PREFIX)]
         prefix: Option<String>,
 
-        /// Base ref to create the worktree from.
-        #[clap(short, long, default_value = "origin/main", env = LOKI_WORKTREE_BASE)]
-        base: String,
+        /// Branch to check out if it exists on the remote, or the starting
+        /// point for a new branch.
+        #[clap(short, long, default_value = "origin/main", env = LOKI_WORKTREE_BRANCH)]
+        branch: String,
 
         /// Name parts joined with dashes to form the worktree and branch name.
         name: Vec<String>,
@@ -232,8 +233,8 @@ fn main() -> Result<(), String> {
             command: RepoSubcommand::Stats(options),
         } => repo_stats(options),
         Cli::Worktree { command } => match command {
-            WorktreeSubcommand::Add { name, base, prefix } => {
-                worktree::worktree_add(name, base, prefix.as_deref())
+            WorktreeSubcommand::Add { name, branch, prefix } => {
+                worktree::worktree_add(name, branch, prefix.as_deref())
             }
             WorktreeSubcommand::Remove { name, force } => {
                 worktree::worktree_remove(name, *force)

src/vars.rs

@@ -1,8 +1,8 @@
 /// Environment variable for the branch name prefix used by `new` and `worktree add`.
 pub const LOKI_NEW_PREFIX: &str = "LOKI_NEW_PREFIX";
 
-/// Environment variable for the base ref used by `worktree add`.
-pub const LOKI_WORKTREE_BASE: &str = "LOKI_WORKTREE_BASE";
+/// Environment variable for the branch used by `worktree add`.
+pub const LOKI_WORKTREE_BRANCH: &str = "LOKI_WORKTREE_BRANCH";
 
 /// Environment variable for the rebase target branch.
 pub const LOKI_REBASE_TARGET: &str = "LOKI_REBASE_TARGET";

src/worktree.rs

@@ -234,9 +234,9 @@ fn list_worktree_entries() -> Result<Vec<WorktreeEntry>, String> {
 // ---------------------------------------------------------------------------
 
 /// Creates a worktree at `<parent>/<repo>_<name>`, then creates and pushes a
-/// branch with optional prefix. If the base ref is an existing remote branch,
+/// branch with optional prefix. If the branch is an existing remote branch,
 /// checks it out directly instead. Outputs `cd <path>` to stdout for piping.
-pub fn worktree_add(name: &[String], base: &str, prefix: Option<&str>) -> Result<(), String> {
+pub fn worktree_add(name: &[String], branch: &str, prefix: Option<&str>) -> Result<(), String> {
     if name.is_empty() {
         return Err(String::from("name cannot be empty."));
     }
@@ -250,11 +250,11 @@ pub fn worktree_add(name: &[String], base: &str, prefix: Option<&str>) -> Result
         return Err(format!("Worktree path already exists: {wt_path_str}"));
     }
 
-    // Check if the base is an existing remote branch to check out directly
-    if let Some(remote_ref) = find_remote_branch(base) {
+    // Check if the branch is an existing remote branch to check out directly
+    if let Some(remote_ref) = find_remote_branch(branch) {
         eprintln!(
             "Found existing branch {} — checking out into worktree",
-            base.cyan()
+            branch.cyan()
         );
         git_command_status_quiet("fetch", vec!["fetch", "origin"])?;
         git_command_status_quiet(
@@ -264,7 +264,7 @@ pub fn worktree_add(name: &[String], base: &str, prefix: Option<&str>) -> Result
                 "add",
                 "--track",
                 "-b",
-                base,
+                branch,
                 wt_path_str.as_ref(),
                 remote_ref.as_str(),
             ],
@@ -282,7 +282,7 @@ pub fn worktree_add(name: &[String], base: &str, prefix: Option<&str>) -> Result
     eprintln!("Creating worktree at {}", wt_path_str.green());
     git_command_status_quiet(
         "worktree add",
-        vec!["worktree", "add", wt_path_str.as_ref(), base],
+        vec!["worktree", "add", wt_path_str.as_ref(), branch],
     )?;
 
     std::env::set_current_dir(&wt_path)