Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Add fixture-based test repo initialization for faster tests

Maximilian Roos1a8fb80d87a3
diff --git a/.typos.toml b/.typos.toml
index f3ebf1951..97fb9e8d4 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -1,5 +1,6 @@
[default.extend-words]
# Git commit hashes that typos flags as potential typos
ba = "ba" # Part of commit hashes like e28e0ba
+ede = "ede" # Part of commit hashes like ede2fd3
# ANSI escape codes in snapshots make is_main/is_current/is_previous look like "mis"
mis = "mis"
diff --git a/README.md b/README.md
index 2fb582c61..0628a3e49 100644
--- a/README.md
+++ b/README.md
@@ -61,9 +61,9 @@ Create a worktree for a new task:
<!-- ⚠️ AUTO-GENERATED from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap — edit source to update -->
-```console
+```bash
$ wt switch --create fix-auth
-✅ Created worktree fix-auth based off main @ ../repo.fix-auth
+✅ Created new worktree for fix-auth from main at ../repo.fix-auth
```
<!-- END AUTO-GENERATED -->
@@ -72,9 +72,9 @@ Switch to an existing worktree:
<!-- ⚠️ AUTO-GENERATED from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap — edit source to update -->
-```console
+```bash
$ wt switch feature-api
-✅ Switched to feature-api @ ../repo.feature-api
+✅ Switched to worktree for feature-api at ../repo.feature-api
```
<!-- END AUTO-GENERATED -->
@@ -86,11 +86,11 @@ See all worktrees at a glance:
```console
$ wt list
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 28d38c20 30m Add API tests
-^ main ^⇅ ./repo ⇡1 ⇣1 2e6b7a8f 4d Merge fix-auth:…
-+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 1d697d5b 5h Add secure token…
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 d35485d7 30m Add API tests
+^ main ^⇅ ./repo ⇡1 ⇣1 e18e1b4d 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 2517d700 5h Add secure token…
-⚪ Showing 3 worktrees; 1 with changes, 2 ahead
+⚪ Showing 3 worktrees, 1 with changes, 2 ahead
```
<!-- END AUTO-GENERATED -->
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index 119e2ca89..3d6a25547 100644
--- a/docs/content/claude-code.md
+++ b/docs/content/claude-code.md
@@ -17,12 +17,12 @@ The plugin adds status indicators to `wt list`:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>main</b> <span class=d>^</span> <b>./repo</b> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>
-+ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> ./repo.feature-api <span class=d>9606cd0f</span> <span class=d>1d</span> <span class=d>Add REST API endpoints</span>
-+ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> ./repo.review-ui <span class=d>afd3b353</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
-+ <span class=d>wip-docs</span> <span class=c>?</span> <span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>
+@ <b>main</b> <span class=d>^</span> <b>./repo</b> <span class=d>002eabd0</span> <span class=d>1d</span> <span class=d>Initial commit</span>
++ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> ./repo.feature-api <span class=d>2f045483</span> <span class=d>1d</span> <span class=d>Add REST API endpoints</span>
++ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> ./repo.review-ui <span class=d>b8c11f99</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
++ <span class=d>wip-docs</span> <span class=c>?</span> <span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>002eabd0</span> <span class=d>1d</span> <span class=d>Initial commit</span>
-⚪ <span class=d>Showing 4 worktrees; 2 ahead</span>
+⚪ <span class=d>Showing 4 worktrees, 2 ahead</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/docs/content/list.md b/docs/content/list.md
index 10e218454..7c3d24d2b 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -21,11 +21,11 @@ List all worktrees:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>28d38c20</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>2e6b7a8f</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>1d697d5b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>d35485d7</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>e18e1b4d</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>2517d700</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
-⚪ <span class=d>Showing 3 worktrees; 1 with changes, 2 ahead</span>
+⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -37,11 +37,11 @@ Include CI status and line diffs:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list --full</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>d35485d7</span> <span class=d>30m</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>e18e1b4d</span> <span class=d>4d</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>2517d700</span> <span class=d>5h</span>
-⚪ <span class=d>Showing 3 worktrees; 1 with changes, 2 ahead; 1 column hidden</span>
+⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -53,13 +53,13 @@ Include branches that don't have worktrees:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list --branches --full</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
- exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>
- wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>d35485d7</span> <span class=d>30m</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>e18e1b4d</span> <span class=d>4d</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>2517d700</span> <span class=d>5h</span>
+ exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>52cad122</span> <span class=d>2d</span>
+ wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>7ca6d817</span> <span class=d>3d</span>
-⚪ <span class=d>Showing 3 worktrees, 2 branches; 1 with changes, 4 ahead; 1 column hidden</span>
+⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/docs/content/why-worktrunk.md b/docs/content/why-worktrunk.md
index c4bfe8e80..210dafc15 100644
--- a/docs/content/why-worktrunk.md
+++ b/docs/content/why-worktrunk.md
@@ -50,7 +50,7 @@ Create a worktree for a new task:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt switch --create fix-auth</span>
-✅ <span class=g>Created worktree <b>fix-auth</b> based off <b>main</b> @ <b>../repo.fix-auth</b></span>
+✅ <span class=g>Created new worktree for <b>fix-auth</b> from <b>main</b> at <b>../repo.fix-auth</b></span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -61,7 +61,7 @@ Switch to an existing worktree:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt switch feature-api</span>
-✅ <span class=g>Switched to <b>feature-api</b> @ <b>../repo.feature-api</b></span>
+✅ <span class=g>Switched to worktree for <b>feature-api</b> at <b>../repo.feature-api</b></span>
{% end %}
<!-- END AUTO-GENERATED -->
@@ -73,11 +73,11 @@ See all worktrees at a glance:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>28d38c20</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>2e6b7a8f</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>1d697d5b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>d35485d7</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>e18e1b4d</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>2517d700</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
-⚪ <span class=d>Showing 3 worktrees; 1 with changes, 2 ahead</span>
+⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rs
index 7dc21a142..3d83beb4a 100644
--- a/src/commands/command_approval.rs
+++ b/src/commands/command_approval.rs
@@ -87,7 +87,7 @@ pub fn approve_command_batch(
let _ = output::print(warning_message(format!(
"Failed to save command approval: {e}"
)));
- let _ = output::print(hint_message("Approval will be requested again next time"));
+ let _ = output::print(hint_message("Approval will be requested again next time."));
}
}
diff --git a/src/commands/config.rs b/src/commands/config.rs
index 0dcf9e163..4dacf16c2 100644
--- a/src/commands/config.rs
+++ b/src/commands/config.rs
@@ -419,7 +419,7 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {
out,
"{}",
hint_message(cformat!(
- "Run <bright-black>wt config shell install</> to enable shell integration"
+ "<bright-black>wt config shell install</> enables shell integration"
))
)?;
}
@@ -447,7 +447,7 @@ fn render_binaries_status(out: &mut String) -> anyhow::Result<()> {
out,
"{}",
warning_message(cformat!(
- "<bold>gh</> installed but not authenticated; run <bold>gh auth login</>"
+ "<bold>gh</> installed but not authenticated; run <bright-black>gh auth login</>"
))
)?;
}
@@ -455,7 +455,9 @@ fn render_binaries_status(out: &mut String) -> anyhow::Result<()> {
writeln!(
out,
"{}",
- hint_message(cformat!("Install <bright-black>gh</> for GitHub CI status"))
+ hint_message(cformat!(
+ "<bold>gh</> not found (GitHub CI status unavailable)"
+ ))
)?;
}
@@ -472,7 +474,7 @@ fn render_binaries_status(out: &mut String) -> anyhow::Result<()> {
out,
"{}",
warning_message(cformat!(
- "<bold>glab</> installed but not authenticated; run <bold>glab auth login</>"
+ "<bold>glab</> installed but not authenticated; run <bright-black>glab auth login</>"
))
)?;
}
@@ -481,7 +483,7 @@ fn render_binaries_status(out: &mut String) -> anyhow::Result<()> {
out,
"{}",
hint_message(cformat!(
- "Install <bright-black>glab</> for GitLab CI status"
+ "<bold>glab</> not found (GitLab CI status unavailable)"
))
)?;
}
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rs
index edec02bf8..7e59ce46e 100644
--- a/src/commands/list/collect.rs
+++ b/src/commands/list/collect.rs
@@ -642,26 +642,20 @@ pub fn collect(
let num_local_branches = branches_without_worktrees.len();
let num_remote_branches = remote_branches.len();
- let footer_base = {
- let wt_plural = if num_worktrees == 1 { "" } else { "s" };
+ let footer_base =
if (show_branches && num_local_branches > 0) || (show_remotes && num_remote_branches > 0) {
- let mut parts = vec![format!("{} worktree{}", num_worktrees, wt_plural)];
+ let mut parts = vec![format!("{} worktrees", num_worktrees)];
if show_branches && num_local_branches > 0 {
- let br_plural = if num_local_branches == 1 { "" } else { "es" };
- parts.push(format!("{} branch{}", num_local_branches, br_plural));
+ parts.push(format!("{} branches", num_local_branches));
}
if show_remotes && num_remote_branches > 0 {
- let rb_plural = if num_remote_branches == 1 { "" } else { "es" };
- parts.push(format!(
- "{} remote branch{}",
- num_remote_branches, rb_plural
- ));
+ parts.push(format!("{} remote branches", num_remote_branches));
}
format!("Showing {}", parts.join(", "))
} else {
- format!("Showing {} worktree{}", num_worktrees, wt_plural)
- }
- };
+ let plural = if num_worktrees == 1 { "" } else { "s" };
+ format!("Showing {} worktree{}", num_worktrees, plural)
+ };
// Create progressive table if showing progress
let mut progressive_table = if show_progress {
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index 292176724..16e67e797 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -284,58 +284,44 @@ impl SummaryMetrics {
}
}
- /// Returns (primary_parts, status_parts, meta_parts) for structured joining.
- /// Primary: worktree/branch counts
- /// Status: dirty/ahead counts
- /// Meta: hidden columns
pub(super) fn summary_parts(
&self,
include_branches: bool,
hidden_columns: usize,
- ) -> (Vec<String>, Vec<String>, Vec<String>) {
- let mut primary = Vec::new();
- let mut status = Vec::new();
- let mut meta = Vec::new();
+ ) -> Vec<String> {
+ let mut parts = Vec::new();
- // Primary: item counts
- let wt_plural = if self.worktrees == 1 { "" } else { "s" };
if include_branches {
- primary.push(format!("{} worktree{}", self.worktrees, wt_plural));
+ parts.push(format!("{} worktrees", self.worktrees));
if self.local_branches > 0 {
- let br_plural = if self.local_branches == 1 { "" } else { "es" };
- primary.push(format!("{} branch{}", self.local_branches, br_plural));
+ parts.push(format!("{} branches", self.local_branches));
}
if self.remote_branches > 0 {
- let rb_plural = if self.remote_branches == 1 { "" } else { "es" };
- primary.push(format!(
- "{} remote branch{}",
- self.remote_branches, rb_plural
- ));
+ parts.push(format!("{} remote branches", self.remote_branches));
}
} else {
- primary.push(format!("{} worktree{}", self.worktrees, wt_plural));
+ let plural = if self.worktrees == 1 { "" } else { "s" };
+ parts.push(format!("{} worktree{}", self.worktrees, plural));
}
- // Status: state counts
if self.dirty_worktrees > 0 {
- status.push(format!("{} with changes", self.dirty_worktrees));
+ parts.push(format!("{} with changes", self.dirty_worktrees));
}
if self.ahead_items > 0 {
- status.push(format!("{} ahead", self.ahead_items));
+ parts.push(format!("{} ahead", self.ahead_items));
}
- // Meta: UI state
if hidden_columns > 0 {
let plural = if hidden_columns == 1 {
"column"
} else {
"columns"
};
- meta.push(format!("{} {} hidden", hidden_columns, plural));
+ parts.push(format!("{} {} hidden", hidden_columns, plural));
}
- (primary, status, meta)
+ parts
}
}
@@ -350,17 +336,8 @@ pub(crate) fn format_summary_message(
let metrics = SummaryMetrics::from_items(items);
let dim = Style::new().dimmed();
- let (primary, status, meta) = metrics.summary_parts(show_branches, hidden_nonempty_count);
-
- // Join groups with semicolons, items within groups with commas
- let mut groups = vec![primary.join(", ")];
- if !status.is_empty() {
- groups.push(status.join(", "));
- }
- if !meta.is_empty() {
- groups.push(meta.join(", "));
- }
- let summary = groups.join("; ");
-
+ let summary = metrics
+ .summary_parts(show_branches, hidden_nonempty_count)
+ .join(", ");
format!("{INFO_EMOJI} {dim}Showing {summary}{dim:#}")
}
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index e82d01874..e639f6aa9 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -342,9 +342,9 @@ pub fn handle_switch(
// Check if base flag was provided without create flag
if resolved_base.is_some() && !create {
- crate::output::print(warning_message(cformat!(
- "<bold>--base</> is only used with <bold>--create</>; ignoring"
- )))?;
+ crate::output::print(warning_message(
+ "--base flag is only used with --create, ignoring",
+ ))?;
}
// Compute expected worktree path for this branch
diff --git a/src/llm.rs b/src/llm.rs
index 37c61e342..443b8cc49 100644
--- a/src/llm.rs
+++ b/src/llm.rs
@@ -423,7 +423,7 @@ pub fn test_commit_generation(
) -> anyhow::Result<String> {
if !commit_generation_config.is_configured() {
anyhow::bail!(
- "Commit generation is not configured. Add [commit-generation] to the config."
+ "Commit generation is not configured. Add [commit-generation] to your config."
);
}
diff --git a/src/output/directive.rs b/src/output/directive.rs
index 2a05d4d7a..4088f8417 100644
--- a/src/output/directive.rs
+++ b/src/output/directive.rs
@@ -12,7 +12,7 @@
//!
//! **stderr** (streams directly to terminal in real-time):
//! ```text
-//! ✅ Created worktree my-branch based off main @ ~/worktrees/my-branch
+//! ✅ Created new worktree for my-branch at ~/worktrees/my-branch
//! ```
//!
//! **stdout** (shell script emitted at the end):
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index bb82cae04..5caf98d20 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -21,7 +21,7 @@ use worktrunk::styling::{
/// Format a switch success message with a consistent location phrase
///
/// Both interactive and directive modes now use the human-friendly
-/// `"Created worktree {branch} based off {base} @ {path}"` wording so
+/// `"Created new worktree for {branch} from {base} at {path}"` wording so
/// users see the same message regardless of how worktrunk is invoked.
fn format_switch_success_message(
branch: &str,
@@ -33,20 +33,20 @@ fn format_switch_success_message(
// Determine action and source based on how the worktree was created
// Priority: explicit --create > DWIM from remote > existing local branch
let (action, source) = if created_branch {
- ("Created worktree", base_branch)
+ ("Created new worktree for", base_branch)
} else if let Some(remote) = from_remote {
- ("Created worktree", Some(remote))
+ ("Created worktree for", Some(remote))
} else {
- ("Switched to", None)
+ ("Switched to worktree for", None)
};
match source {
Some(src) => cformat!(
- "<green>{action} <bold>{branch}</> based off <bold>{src}</> @ <bold>{}</></>",
+ "<green>{action} <bold>{branch}</> from <bold>{src}</> at <bold>{}</></>",
format_path_for_display(path)
),
None => cformat!(
- "<green>{action} <bold>{branch}</> @ <bold>{}</></>",
+ "<green>{action} <bold>{branch}</> at <bold>{}</></>",
format_path_for_display(path)
),
}
@@ -225,7 +225,7 @@ fn handle_branch_deletion_result(
"Branch <bold>{branch_name}</> retained; has unmerged changes"
)))?;
super::print(hint_message(cformat!(
- "Use <bright-black>wt remove -D</> to delete unmerged branches"
+ "<bright-black>wt remove -D</> deletes unmerged branches"
)))?;
result
}
@@ -357,7 +357,7 @@ pub fn handle_switch_output(
// Shell integration not configured - show warning and setup hint
let path_display = format_path_for_display(path);
super::print(warning_message(cformat!(
- "Worktree for <bold>{branch}</> at <bold>{path_display}</>; cd unavailable (no shell integration)"
+ "Worktree for <bold>{branch}</> at <bold>{path_display}</>; cannot cd (no shell integration)"
)))?;
super::shell_integration_hint(shell_integration_hint())?;
}
@@ -649,7 +649,7 @@ fn handle_removed_worktree_output(
// Show hint for unmerged branches (same as synchronous path)
if !no_delete_branch && !should_delete_branch {
super::print(hint_message(cformat!(
- "Use <bright-black>wt remove -D</> to delete unmerged branches"
+ "<bright-black>wt remove -D</> deletes unmerged branches"
)))?;
}
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 769194c56..2adc0d86c 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -8,6 +8,14 @@
//! with deterministic timestamps and configuration. Each test gets a fresh repo
//! that is automatically cleaned up when the test ends.
//!
+//! ## Fixture-Based Initialization
+//!
+//! To improve test performance, `TestRepo::new()` copies from a pre-initialized
+//! template stored in `tests/fixtures/template-repo/`. The template contains a
+//! `_git` directory (renamed from `.git` so it can be committed) which gets
+//! copied and renamed to `.git` for each test. This avoids spawning `git init`
+//! for every test, saving ~10ms per test.
+//!
//! ## Environment Isolation
//!
//! Git commands are run with isolated environments using `Command::env()` to ensure:
@@ -117,6 +125,44 @@ use std::process::Command;
use tempfile::TempDir;
use worktrunk::config::sanitize_branch_name;
+/// Path to the fixture template repo (relative to crate root).
+/// Contains `_git/` (renamed .git) and `gitconfig`.
+fn fixture_template_path() -> PathBuf {
+ PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures/template-repo")
+}
+
+/// Copy the fixture template to create a new test repo.
+///
+/// The fixture contains a git repo with one initial commit (on `main` branch).
+/// Copies `_git/` to `.git/`, `file.txt`, and `gitconfig` to `test-gitconfig`.
+/// Uses `cp -r` which benchmarks faster than native Rust fs operations.
+fn copy_fixture_template(dest: &Path) {
+ let template = fixture_template_path();
+
+ // Create repo subdirectory
+ let repo_path = dest.join("repo");
+ std::fs::create_dir(&repo_path).unwrap();
+
+ // Copy _git to repo/.git (suppress stderr for socket file warnings)
+ let output = Command::new("cp")
+ .args(["-r", "--"])
+ .arg(template.join("_git"))
+ .arg(repo_path.join(".git"))
+ .stderr(std::process::Stdio::null())
+ .output()
+ .unwrap();
+ assert!(
+ output.status.success(),
+ "Failed to copy template _git directory"
+ );
+
+ // Copy file.txt (part of the initial commit)
+ std::fs::copy(template.join("file.txt"), repo_path.join("file.txt")).unwrap();
+
+ // Copy gitconfig
+ std::fs::copy(template.join("gitconfig"), dest.join("test-gitconfig")).unwrap();
+}
+
/// Canonicalize a path without Windows verbatim prefix (`\\?\`).
///
/// On Windows, `std::fs::canonicalize()` returns verbatim paths like `\\?\C:\...`
@@ -246,21 +292,50 @@ pub struct TestRepo {
}
impl TestRepo {
- /// Create a new test repository with isolated git environment
+ /// Create a new test repository with isolated git environment.
+ ///
+ /// The repo is initialized on `main` branch with one initial commit.
+ /// Uses a fixture template for fast initialization - copies a pre-initialized
+ /// git repo from `tests/fixtures/template-repo/` instead of running `git init`.
+ /// This saves ~10ms per test by avoiding process spawns.
pub fn new() -> Self {
let temp_dir = TempDir::new().unwrap();
- // Create main repo as a subdirectory so worktrees can be siblings
- let root = temp_dir.path().join("repo");
- std::fs::create_dir(&root).unwrap();
+
+ // Copy from fixture template (includes initial commit)
+ copy_fixture_template(temp_dir.path());
+
// Canonicalize to resolve symlinks (important on macOS where /var is symlink to /private/var)
- let root = canonicalize(&root).unwrap();
+ let root = canonicalize(&temp_dir.path().join("repo")).unwrap();
// Create isolated config path for this test
let test_config_path = temp_dir.path().join("test-config.toml");
+ let git_config_path = temp_dir.path().join("test-gitconfig");
+
+ Self {
+ temp_dir,
+ root,
+ worktrees: HashMap::new(),
+ remote: None,
+ test_config_path,
+ git_config_path,
+ mock_bin_path: None,
+ }
+ }
- // Create git config file with test settings including user identity
- // This eliminates the need for separate `git config user.name/email` commands
+ /// Create an empty test repository (no commits, no branches).
+ ///
+ /// Use this for tests that specifically need to test behavior in an
+ /// uninitialized repo. Most tests should use `new()` instead.
+ pub fn empty() -> Self {
+ let temp_dir = TempDir::new().unwrap();
+ let root = temp_dir.path().join("repo");
+ std::fs::create_dir(&root).unwrap();
+ let root = canonicalize(&root).unwrap();
+
+ let test_config_path = temp_dir.path().join("test-config.toml");
let git_config_path = temp_dir.path().join("test-gitconfig");
+
+ // Write gitconfig
std::fs::write(
&git_config_path,
"[user]\n\tname = Test User\n\temail = [email protected]\n\
@@ -279,11 +354,13 @@ impl TestRepo {
mock_bin_path: None,
};
- // Initialize git repo with isolated environment
- // User config is already in the gitconfig file, no separate config commands needed
+ // Run git init (can't avoid this for empty repos)
let mut cmd = Command::new("git");
repo.configure_git_cmd(&mut cmd);
- cmd.args(["init"]).current_dir(&repo.root).output().unwrap();
+ cmd.args(["init", "-q"])
+ .current_dir(&repo.root)
+ .output()
+ .unwrap();
repo
}
@@ -1438,8 +1515,8 @@ mod tests {
#[test]
fn test_commit_with_age() {
+ // TestRepo::new() already includes one initial commit from fixture
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create commits with specific ages
repo.commit_with_age("One hour ago", HOUR);
@@ -1447,7 +1524,7 @@ mod tests {
repo.commit_with_age("One week ago", WEEK);
repo.commit_with_age("Ten minutes ago", 10 * MINUTE);
- // Verify commits were created (git log shows 5 commits)
+ // Verify commits were created (1 from fixture + 4 = 5 commits)
let output = repo.git_command(&["log", "--oneline"]).output().unwrap();
let log = String::from_utf8_lossy(&output.stdout);
assert_eq!(log.lines().count(), 5);
diff --git a/tests/fixtures/template-repo/_git/HEAD b/tests/fixtures/template-repo/_git/HEAD
new file mode 100644
index 000000000..b870d8262
--- /dev/null
+++ b/tests/fixtures/template-repo/_git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/tests/fixtures/template-repo/_git/config b/tests/fixtures/template-repo/_git/config
new file mode 100644
index 000000000..deb5290f2
--- /dev/null
+++ b/tests/fixtures/template-repo/_git/config
@@ -0,0 +1,12 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+ ignorecase = true
+ precomposeunicode = true
+[user]
+ name = Test User
+[commit]
+ gpgsign = false
diff --git a/tests/fixtures/template-repo/_git/index b/tests/fixtures/template-repo/_git/index
new file mode 100644
index 000000000..bd148bd40
Binary files /dev/null and b/tests/fixtures/template-repo/_git/index differ
diff --git a/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fda b/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fda
new file mode 100644
index 000000000..915806835
--- /dev/null
+++ b/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fda
@@ -0,0 +1,2 @@
+x���
+1 D=�+r���f� �ջ~@["�V��|~�s��7��ZpƝvBHS���� #F�c�%aBa��h��)�6�pT�g���Z�[=u������,�7��;wy-q��}Y6�
\ No newline at end of file
diff --git a/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8 b/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8
new file mode 100644
index 000000000..564346681
Binary files /dev/null and b/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8 differ
diff --git a/tests/fixtures/template-repo/_git/objects/58/52f44639f52db67d30ad9143b86afb143d415f b/tests/fixtures/template-repo/_git/objects/58/52f44639f52db67d30ad9143b86afb143d415f
new file mode 100644
index 000000000..a045f982a
Binary files /dev/null and b/tests/fixtures/template-repo/_git/objects/58/52f44639f52db67d30ad9143b86afb143d415f differ
diff --git a/tests/fixtures/template-repo/_git/refs/heads/main b/tests/fixtures/template-repo/_git/refs/heads/main
new file mode 100644
index 000000000..a735b6ef7
--- /dev/null
+++ b/tests/fixtures/template-repo/_git/refs/heads/main
@@ -0,0 +1 @@
+23e5a15006b67068f23d976a978dfffdb68e5fda
diff --git a/tests/fixtures/template-repo/file.txt b/tests/fixtures/template-repo/file.txt
new file mode 100644
index 000000000..5852f4463
--- /dev/null
+++ b/tests/fixtures/template-repo/file.txt
@@ -0,0 +1 @@
+Initial commit
diff --git a/tests/fixtures/template-repo/gitconfig b/tests/fixtures/template-repo/gitconfig
new file mode 100644
index 000000000..6bf32fe8e
--- /dev/null
+++ b/tests/fixtures/template-repo/gitconfig
@@ -0,0 +1,8 @@
+[user]
+ name = Test User
+[advice]
+ mergeConflict = false
+ resolveConflict = false
+[init]
+ defaultBranch = main
diff --git a/tests/integration_tests/approval_pty.rs b/tests/integration_tests/approval_pty.rs
index 07adbb21f..8463111bf 100644
--- a/tests/integration_tests/approval_pty.rs
+++ b/tests/integration_tests/approval_pty.rs
@@ -142,7 +142,6 @@ fn normalize_output(output: &str) -> String {
#[test]
fn test_approval_prompt_accept() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test command'""#);
repo.commit("Add config");
@@ -163,7 +162,6 @@ fn test_approval_prompt_accept() {
#[test]
fn test_approval_prompt_decline() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test command'""#);
repo.commit("Add config");
@@ -184,7 +182,6 @@ fn test_approval_prompt_decline() {
#[test]
fn test_approval_prompt_multiple_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"[post-create]
first = "echo 'First command'"
@@ -213,7 +210,6 @@ third = "echo 'Third command'"
#[test]
fn test_approval_prompt_permission_error() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test command'""#);
repo.commit("Add config");
@@ -275,7 +271,6 @@ fn test_approval_prompt_permission_error() {
#[test]
fn test_approval_prompt_named_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"[post-create]
install = "echo 'Installing dependencies...'"
@@ -314,7 +309,6 @@ test = "echo 'Running tests...'"
#[test]
fn test_approval_prompt_mixed_approved_unapproved_accept() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"[post-create]
first = "echo 'First command'"
@@ -373,7 +367,6 @@ approved-commands = ["echo 'Second command'"]
#[test]
fn test_approval_prompt_mixed_approved_unapproved_decline() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"[post-create]
first = "echo 'First command'"
@@ -426,9 +419,7 @@ approved-commands = ["echo 'Second command'"]
"Should NOT execute any commands when declined"
);
assert!(
- normalized.contains("Created worktree")
- && normalized.contains("based off")
- && normalized.contains("@"),
+ normalized.contains("Created new worktree"),
"Should still create worktree even when commands declined"
);
assert_snapshot!(
diff --git a/tests/integration_tests/approval_ui.rs b/tests/integration_tests/approval_ui.rs
index 460335427..3ae1b920f 100644
--- a/tests/integration_tests/approval_ui.rs
+++ b/tests/integration_tests/approval_ui.rs
@@ -43,7 +43,6 @@ fn snapshot_approval(test_name: &str, repo: &TestRepo, args: &[&str], approve: b
#[test]
fn test_approval_single_command() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'Worktree path: {{ worktree }}'""#);
@@ -60,7 +59,6 @@ fn test_approval_single_command() {
#[test]
fn test_approval_multiple_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"[post-create]
@@ -84,7 +82,6 @@ pwd = "cd {{ worktree }} && pwd"
#[test]
fn test_approval_mixed_approved_unapproved() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"[post-create]
@@ -118,7 +115,6 @@ approved-commands = ["echo 'Second command'"]
#[test]
fn test_force_flag_does_not_save_approvals() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test command' > output.txt""#);
@@ -159,7 +155,6 @@ fn test_force_flag_does_not_save_approvals() {
#[test]
fn test_already_approved_commands_skip_prompt() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'approved' > output.txt""#);
@@ -185,7 +180,6 @@ approved-commands = ["echo 'approved' > output.txt"]
#[test]
fn test_decline_approval_skips_only_unapproved() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"[post-create]
@@ -221,7 +215,6 @@ approved-commands = ["echo 'Second command'"]
#[test]
fn test_approval_named_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"[post-create]
@@ -282,7 +275,6 @@ fn snapshot_run_hook(test_name: &str, repo: &TestRepo, hook_type: &str, approve:
#[test]
fn test_run_hook_pre_merge_requires_approval() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"pre-merge = "echo 'Running pre-merge checks on {{ branch }}'""#);
@@ -304,7 +296,6 @@ fn test_run_hook_pre_merge_requires_approval() {
#[test]
fn test_run_hook_post_merge_requires_approval() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-merge = "echo 'Post-merge cleanup for {{ branch }}'""#);
@@ -326,7 +317,6 @@ fn test_run_hook_post_merge_requires_approval() {
#[test]
fn test_approval_fails_in_non_tty() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test command'""#);
repo.commit("Add config");
@@ -348,7 +338,6 @@ fn test_approval_fails_in_non_tty() {
#[test]
fn test_force_bypasses_tty_check() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test command'""#);
repo.commit("Add config");
@@ -376,7 +365,6 @@ fn test_force_bypasses_tty_check() {
#[test]
fn test_hook_post_merge_target_is_current_branch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Hook that writes {{ target }} to a file so we can verify its value
repo.write_project_config(r#"post-merge = "echo '{{ target }}' > target-branch.txt""#);
@@ -418,7 +406,6 @@ fn test_hook_post_merge_target_is_current_branch() {
#[test]
fn test_hook_pre_merge_target_is_current_branch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Hook that writes {{ target }} to a file so we can verify its value
repo.write_project_config(r#"pre-merge = "echo '{{ target }}' > target-branch.txt""#);
@@ -460,7 +447,6 @@ fn test_hook_pre_merge_target_is_current_branch() {
#[test]
fn test_step_hook_run_named_command() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Config with multiple named commands
repo.write_project_config(
@@ -505,7 +491,6 @@ build = "echo 'running build' > build.txt"
#[test]
fn test_step_hook_unknown_name_error() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Config with multiple named commands
repo.write_project_config(
@@ -533,7 +518,6 @@ lint = "echo 'lint'"
#[test]
fn test_step_hook_name_filter_on_unnamed_command() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Config with a single unnamed command (no table)
repo.write_project_config(r#"pre-merge = "echo 'test'""#);
@@ -553,7 +537,6 @@ fn test_step_hook_name_filter_on_unnamed_command() {
#[test]
fn test_step_hook_run_all_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Config with multiple named commands
repo.write_project_config(
diff --git a/tests/integration_tests/approvals.rs b/tests/integration_tests/approvals.rs
index ceabcd462..84ec8e5cd 100644
--- a/tests/integration_tests/approvals.rs
+++ b/tests/integration_tests/approvals.rs
@@ -31,7 +31,6 @@ fn snapshot_clear_approvals(test_name: &str, repo: &TestRepo, args: &[&str]) {
#[test]
fn test_add_approvals_no_config() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
snapshot_add_approvals("add_approvals_no_config", &repo, &[]);
}
@@ -39,7 +38,6 @@ fn test_add_approvals_no_config() {
#[test]
fn test_add_approvals_all_with_none_approved() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test'""#);
repo.commit("Add config");
@@ -49,7 +47,6 @@ fn test_add_approvals_all_with_none_approved() {
#[test]
fn test_add_approvals_empty_config() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config("");
repo.commit("Add empty config");
@@ -63,7 +60,6 @@ fn test_add_approvals_empty_config() {
#[test]
fn test_clear_approvals_no_approvals() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
snapshot_clear_approvals("clear_approvals_no_approvals", &repo, &[]);
}
@@ -93,7 +89,6 @@ fn test_clear_approvals_with_approvals() {
#[test]
fn test_clear_approvals_global_no_approvals() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
snapshot_clear_approvals("clear_approvals_global_no_approvals", &repo, &["--global"]);
}
@@ -154,7 +149,6 @@ fn test_clear_approvals_after_clear() {
#[test]
fn test_clear_approvals_multiple_approvals() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.write_project_config(
r#"
post-create = "echo 'first'"
diff --git a/tests/integration_tests/column_alignment_verification.rs b/tests/integration_tests/column_alignment_verification.rs
index 562802aec..1a3b17a6d 100644
--- a/tests/integration_tests/column_alignment_verification.rs
+++ b/tests/integration_tests/column_alignment_verification.rs
@@ -311,7 +311,6 @@ fn verify_table_alignment(output: &str) -> Result<(), String> {
#[test]
fn test_alignment_verification_with_varying_content() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create diverse worktrees to test alignment
repo.add_worktree("main-feature");
@@ -378,7 +377,6 @@ fn test_alignment_with_unicode_content() {
#[test]
fn test_alignment_with_sparse_columns() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create mix of worktrees - some with diffs, some without
repo.add_worktree("no-changes-1");
@@ -417,7 +415,6 @@ fn test_alignment_with_sparse_columns() {
#[test]
fn test_alignment_real_world_scenario() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature branches with varying amounts of working tree changes
// This simulates a real-world scenario with different diff sizes
@@ -468,7 +465,6 @@ fn test_alignment_real_world_scenario() {
#[test]
fn test_alignment_at_different_terminal_widths() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature-a");
repo.add_worktree("feature-b");
diff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rs
index 5ea6d1273..d3d602cb5 100644
--- a/tests/integration_tests/completion.rs
+++ b/tests/integration_tests/completion.rs
@@ -207,7 +207,7 @@ fn test_complete_outside_git_repo() {
#[test]
fn test_complete_empty_repo() {
- let repo = TestRepo::new();
+ let repo = TestRepo::empty();
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
diff --git a/tests/integration_tests/config_cache.rs b/tests/integration_tests/config_cache.rs
index a76a653df..b7077ee53 100644
--- a/tests/integration_tests/config_cache.rs
+++ b/tests/integration_tests/config_cache.rs
@@ -18,7 +18,6 @@ fn wt_config_cache_cmd(repo: &TestRepo, args: &[&str]) -> Command {
#[test]
fn test_config_cache_show_empty() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_config_cache_cmd(&repo, &["show"]).output().unwrap();
assert!(output.status.success());
@@ -34,7 +33,6 @@ fn test_config_cache_show_empty() {
#[test]
fn test_config_cache_show_with_default_branch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Set default branch cache manually
repo.git_command(&["config", "worktrunk.defaultBranch", "main"])
@@ -55,7 +53,6 @@ fn test_config_cache_show_with_default_branch() {
#[test]
fn test_config_cache_show_with_ci_entries() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Add CI cache entries - use TEST_EPOCH for deterministic age=0s in snapshots
repo.git_command(&[
@@ -94,7 +91,6 @@ fn test_config_cache_show_with_ci_entries() {
#[test]
fn test_config_cache_clear_all_empty() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_config_cache_cmd(&repo, &["clear"]).output().unwrap();
assert!(output.status.success());
@@ -104,7 +100,6 @@ fn test_config_cache_clear_all_empty() {
#[test]
fn test_config_cache_clear_all_with_data() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Set default branch cache
repo.git_command(&["config", "worktrunk.defaultBranch", "main"])
@@ -119,7 +114,6 @@ fn test_config_cache_clear_all_with_data() {
#[test]
fn test_config_cache_clear_default_branch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Set default branch cache
repo.git_command(&["config", "worktrunk.defaultBranch", "main"])
@@ -136,7 +130,6 @@ fn test_config_cache_clear_default_branch() {
#[test]
fn test_config_cache_clear_default_branch_empty() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_config_cache_cmd(&repo, &["clear", "default-branch"])
.output()
@@ -148,7 +141,6 @@ fn test_config_cache_clear_default_branch_empty() {
#[test]
fn test_config_cache_clear_ci_empty() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_config_cache_cmd(&repo, &["clear", "ci"])
.output()
@@ -160,7 +152,6 @@ fn test_config_cache_clear_ci_empty() {
#[test]
fn test_config_cache_clear_unknown_type() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_config_cache_cmd(&repo, &["clear", "unknown"])
.output()
@@ -177,7 +168,6 @@ fn test_config_cache_clear_unknown_type() {
#[test]
fn test_config_cache_clear_logs_empty() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_config_cache_cmd(&repo, &["clear", "logs"])
.output()
@@ -189,7 +179,6 @@ fn test_config_cache_clear_logs_empty() {
#[test]
fn test_config_cache_clear_logs_with_files() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create wt-logs directory with some log files
let git_dir = repo.root_path().join(".git");
@@ -211,7 +200,6 @@ fn test_config_cache_clear_logs_with_files() {
#[test]
fn test_config_cache_clear_logs_single_file() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create wt-logs directory with one log file
let git_dir = repo.root_path().join(".git");
@@ -229,7 +217,6 @@ fn test_config_cache_clear_logs_single_file() {
#[test]
fn test_config_cache_clear_all_with_logs() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create wt-logs directory with a log file
let git_dir = repo.root_path().join(".git");
diff --git a/tests/integration_tests/config_var.rs b/tests/integration_tests/config_var.rs
index e2c8c4a82..41f01f35a 100644
--- a/tests/integration_tests/config_var.rs
+++ b/tests/integration_tests/config_var.rs
@@ -32,7 +32,6 @@ fn wt_var_get_cmd(repo: &TestRepo, args: &[&str]) -> Command {
#[test]
fn test_var_set_marker_branch_default() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_var_set_cmd(&repo, &["marker", "🚧"]).output().unwrap();
assert!(output.status.success());
@@ -49,7 +48,6 @@ fn test_var_set_marker_branch_default() {
#[test]
fn test_var_set_marker_branch_specific() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.git_command(&["branch", "feature"]).status().unwrap();
let output = wt_var_set_cmd(&repo, &["marker", "🔧", "--branch", "feature"])
@@ -69,7 +67,6 @@ fn test_var_set_marker_branch_specific() {
#[test]
fn test_var_clear_marker_branch_default() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Set a marker first
repo.git_command(&["config", "worktrunk.marker.main", "🚧"])
@@ -91,7 +88,6 @@ fn test_var_clear_marker_branch_default() {
#[test]
fn test_var_clear_marker_branch_specific() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Set a marker first
repo.git_command(&["config", "worktrunk.marker.feature", "🔧"])
@@ -115,7 +111,6 @@ fn test_var_clear_marker_branch_specific() {
#[test]
fn test_var_clear_marker_all() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Set multiple markers
repo.git_command(&["config", "worktrunk.marker.main", "🚧"])
@@ -145,7 +140,6 @@ fn test_var_clear_marker_all() {
#[test]
fn test_var_clear_marker_all_empty() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_var_clear_cmd(&repo, &["marker", "--all"])
.output()
@@ -157,7 +151,6 @@ fn test_var_clear_marker_all_empty() {
#[test]
fn test_var_get_marker() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Set a marker first
repo.git_command(&["config", "worktrunk.marker.main", "🚧"])
@@ -173,7 +166,6 @@ fn test_var_get_marker() {
#[test]
fn test_var_get_marker_empty() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_var_get_cmd(&repo, &["marker"]).output().unwrap();
assert!(output.status.success());
@@ -184,7 +176,6 @@ fn test_var_get_marker_empty() {
#[test]
fn test_var_get_marker_specific_branch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.git_command(&["branch", "feature"]).status().unwrap();
// Set a marker for feature branch
@@ -203,7 +194,6 @@ fn test_var_get_marker_specific_branch() {
#[test]
fn test_var_get_default_branch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = wt_var_get_cmd(&repo, &["default-branch"]).output().unwrap();
assert!(output.status.success());
@@ -214,7 +204,6 @@ fn test_var_get_default_branch() {
#[test]
fn test_var_get_default_branch_no_remote() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Without remote, should infer from local branches
let output = wt_var_get_cmd(&repo, &["default-branch"]).output().unwrap();
@@ -226,7 +215,6 @@ fn test_var_get_default_branch_no_remote() {
#[test]
fn test_var_get_ci_status() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Without any CI configured, should return "noci"
let output = wt_var_get_cmd(&repo, &["ci-status"]).output().unwrap();
@@ -237,7 +225,6 @@ fn test_var_get_ci_status() {
#[test]
fn test_var_get_ci_status_specific_branch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.git_command(&["branch", "feature"]).status().unwrap();
// Without any CI configured, should return "noci"
@@ -251,7 +238,6 @@ fn test_var_get_ci_status_specific_branch() {
#[test]
fn test_var_get_ci_status_nonexistent_branch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Should error for nonexistent branch
let output = wt_var_get_cmd(&repo, &["ci-status", "--branch", "nonexistent"])
diff --git a/tests/integration_tests/default_branch.rs b/tests/integration_tests/default_branch.rs
index 02dbe8eb5..6fa09ba7f 100644
--- a/tests/integration_tests/default_branch.rs
+++ b/tests/integration_tests/default_branch.rs
@@ -4,7 +4,6 @@ use worktrunk::git::Repository;
#[test]
fn test_get_default_branch_with_origin_head() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_remote("main");
// origin/HEAD should be set automatically by setup_remote
@@ -18,7 +17,6 @@ fn test_get_default_branch_with_origin_head() {
#[test]
fn test_get_default_branch_without_origin_head() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_remote("main");
// Clear origin/HEAD to force remote query
@@ -36,7 +34,6 @@ fn test_get_default_branch_without_origin_head() {
#[test]
fn test_get_default_branch_caches_result() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_remote("main");
// Clear origin/HEAD
@@ -55,7 +52,6 @@ fn test_get_default_branch_caches_result() {
#[test]
fn test_get_default_branch_no_remote() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// No remote configured, should infer from local branches
// Since there's only one local branch, it should return that
@@ -74,7 +70,6 @@ fn test_get_default_branch_no_remote() {
#[test]
fn test_get_default_branch_with_custom_remote() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_custom_remote("upstream", "main");
// Test that we can get the default branch from a custom remote
@@ -85,7 +80,6 @@ fn test_get_default_branch_with_custom_remote() {
#[test]
fn test_primary_remote_detects_custom_remote() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_custom_remote("upstream", "develop");
// Test that primary_remote detects the custom remote name
@@ -96,7 +90,6 @@ fn test_primary_remote_detects_custom_remote() {
#[test]
fn test_branch_exists_with_custom_remote() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_custom_remote("upstream", "main");
let git_repo = Repository::at(repo.root_path());
@@ -111,7 +104,6 @@ fn test_branch_exists_with_custom_remote() {
#[test]
fn test_get_default_branch_no_remote_common_names_fallback() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create additional branches (no remote configured)
repo.git_command(&["branch", "feature"]).status().unwrap();
@@ -126,7 +118,6 @@ fn test_get_default_branch_no_remote_common_names_fallback() {
#[test]
fn test_get_default_branch_no_remote_master_fallback() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Rename main to master, then create other branches
repo.git_command(&["branch", "-m", "main", "master"])
@@ -144,7 +135,6 @@ fn test_get_default_branch_no_remote_master_fallback() {
#[test]
fn test_get_default_branch_no_remote_init_default_branch_config() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Rename main to something non-standard, create the configured default
repo.git_command(&["branch", "-m", "main", "primary"])
@@ -166,7 +156,6 @@ fn test_get_default_branch_no_remote_init_default_branch_config() {
#[test]
fn test_get_default_branch_no_remote_fails_when_no_match() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Rename main to something non-standard
repo.git_command(&["branch", "-m", "main", "xyz"])
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index bc3ac8711..fca08bd1c 100644
--- a/tests/integration_tests/directives.rs
+++ b/tests/integration_tests/directives.rs
@@ -123,7 +123,6 @@ fn test_remove_internal_powershell_directive() {
#[test]
fn test_switch_internal_directive() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
@@ -156,7 +155,6 @@ fn test_switch_internal_directive() {
#[test]
fn test_switch_without_internal() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
@@ -185,7 +183,6 @@ fn test_switch_without_internal() {
#[test]
fn test_remove_internal_directive() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
@@ -215,7 +212,6 @@ fn test_remove_internal_directive() {
#[test]
fn test_remove_without_internal() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let mut settings = Settings::clone_current();
settings.set_snapshot_path("../snapshots");
@@ -240,7 +236,6 @@ fn test_remove_without_internal() {
#[test]
fn test_merge_internal_no_remove() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -291,7 +286,6 @@ fn test_merge_internal_no_remove() {
#[test]
fn test_merge_internal_remove() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
diff --git a/tests/integration_tests/e2e_shell.rs b/tests/integration_tests/e2e_shell.rs
index 17fc3bc65..ffa5f8252 100644
--- a/tests/integration_tests/e2e_shell.rs
+++ b/tests/integration_tests/e2e_shell.rs
@@ -27,7 +27,6 @@ macro_rules! skip_if_shell_unavailable {
fn test_shell_integration_switch_and_remove(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let repo = TestRepo::new();
- repo.commit("Initial commit");
let init_code = generate_init_code(&repo, shell);
let bin_path = wt_bin_dir();
@@ -83,7 +82,6 @@ fn test_shell_integration_switch_and_remove(#[case] shell: &str) {
fn test_bash_shell_integration_error_handling() {
skip_if_shell_unavailable!("bash");
let repo = TestRepo::new();
- repo.commit("Initial commit");
let init_code = generate_init_code(&repo, "bash");
let bin_path = wt_bin_dir();
@@ -125,7 +123,6 @@ fn test_bash_shell_integration_error_handling() {
fn test_bash_shell_integration_switch_existing_worktree() {
skip_if_shell_unavailable!("bash");
let repo = TestRepo::new();
- repo.commit("Initial commit");
let init_code = generate_init_code(&repo, "bash");
let bin_path = wt_bin_dir();
diff --git a/tests/integration_tests/e2e_shell_post_start.rs b/tests/integration_tests/e2e_shell_post_start.rs
index f2fbc8202..96781c039 100644
--- a/tests/integration_tests/e2e_shell_post_start.rs
+++ b/tests/integration_tests/e2e_shell_post_start.rs
@@ -30,7 +30,6 @@ macro_rules! skip_if_shell_unavailable {
fn test_shell_integration_post_start_background(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with background command
let config_dir = repo.root_path().join(".config");
@@ -123,7 +122,6 @@ approved-commands = ["sleep 0.05 && echo 'Background task done' > bg_marker.txt"
#[test]
fn test_bash_shell_integration_post_start_parallel() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with multiple background commands
let config_dir = repo.root_path().join(".config");
@@ -196,7 +194,6 @@ approved-commands = [
#[test]
fn test_bash_shell_integration_post_create_blocks() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with blocking command
let config_dir = repo.root_path().join(".config");
@@ -268,7 +265,6 @@ approved-commands = ["echo 'Setup done' > setup.txt"]
#[test]
fn test_fish_shell_integration_post_start_background() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with background command
let config_dir = repo.root_path().join(".config");
diff --git a/tests/integration_tests/hook_show.rs b/tests/integration_tests/hook_show.rs
index d973d7b03..f2f623247 100644
--- a/tests/integration_tests/hook_show.rs
+++ b/tests/integration_tests/hook_show.rs
@@ -9,7 +9,6 @@ use tempfile::TempDir;
#[test]
fn test_hook_show_with_both_configs() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let temp_home = TempDir::new().unwrap();
// Create user config with hooks
@@ -52,7 +51,6 @@ test = "cargo test"
#[test]
fn test_hook_show_no_hooks() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let temp_home = TempDir::new().unwrap();
// Create user config without hooks
@@ -80,7 +78,6 @@ fn test_hook_show_no_hooks() {
#[test]
fn test_hook_show_filter_by_type() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let temp_home = TempDir::new().unwrap();
// Create user config without hooks
@@ -126,7 +123,6 @@ deploy = "scripts/deploy.sh"
#[test]
fn test_hook_show_approval_status() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let temp_home = TempDir::new().unwrap();
// Create user config at XDG path with one approved command
diff --git a/tests/integration_tests/internal_flag.rs b/tests/integration_tests/internal_flag.rs
index 9314ac5cf..f5fa20c10 100644
--- a/tests/integration_tests/internal_flag.rs
+++ b/tests/integration_tests/internal_flag.rs
@@ -25,7 +25,6 @@ use tempfile::TempDir;
#[test]
fn test_list_with_internal_flag() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let settings = setup_snapshot_settings(&repo);
@@ -46,7 +45,6 @@ fn test_list_with_internal_flag() {
#[test]
fn test_config_show_with_internal_flag() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
let temp_home = TempDir::new().unwrap();
// Setup mock gh/glab for deterministic BINARIES output
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index 3453aac3b..9d78753f7 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -231,7 +231,6 @@ fn push_branch(repo: &TestRepo, branch_name: &str) {
#[test]
fn test_list_single_worktree() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
snapshot_list("single_worktree", &repo);
}
@@ -239,7 +238,6 @@ fn test_list_single_worktree() {
#[test]
fn test_list_multiple_worktrees() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature-a");
repo.add_worktree("feature-b");
@@ -253,7 +251,6 @@ fn test_list_multiple_worktrees() {
#[test]
fn test_list_previous_worktree_gutter() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature");
@@ -282,7 +279,6 @@ fn test_list_previous_worktree_gutter() {
#[test]
fn test_list_detached_head() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.detach_head();
@@ -294,7 +290,6 @@ fn test_list_detached_head_in_worktree() {
// Non-main worktree in detached HEAD SHOULD show path mismatch flag
// (detached HEAD = "not at home", not on any branch)
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature");
repo.detach_head_in_worktree("feature");
@@ -305,7 +300,6 @@ fn test_list_detached_head_in_worktree() {
#[test]
fn test_list_locked_worktree() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("locked-feature");
repo.lock_worktree("locked-feature", Some("Testing lock functionality"));
@@ -316,7 +310,6 @@ fn test_list_locked_worktree() {
#[test]
fn test_list_locked_no_reason() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("locked-no-reason");
repo.lock_worktree("locked-no-reason", None);
@@ -357,7 +350,6 @@ fn test_list_unicode_commit_message() {
#[test]
fn test_list_many_worktrees_with_varied_stats() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create multiple worktrees with different characteristics
repo.add_worktree("short");
@@ -378,7 +370,6 @@ fn test_list_many_worktrees_with_varied_stats() {
#[test]
fn test_list_json_with_metadata() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktree with detached head
repo.add_worktree("feature-detached");
@@ -395,7 +386,6 @@ fn test_list_json_with_metadata() {
#[test]
fn test_list_json_tree_matches_main_after_merge() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature branch with a worktree
let feature_path = repo.add_worktree("feature-merged");
@@ -446,7 +436,6 @@ fn test_list_json_tree_matches_main_after_merge() {
#[test]
fn test_list_with_branches_flag() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create some branches without worktrees
create_branch(&repo, "feature-without-worktree");
@@ -462,7 +451,6 @@ fn test_list_with_branches_flag() {
#[test]
fn test_list_with_branches_flag_no_available() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// All branches have worktrees (only main exists and has worktree)
repo.add_worktree("feature-a");
@@ -474,7 +462,6 @@ fn test_list_with_branches_flag_no_available() {
#[test]
fn test_list_with_branches_flag_only_branches() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create several branches without worktrees
create_branch(&repo, "branch-alpha");
@@ -487,7 +474,6 @@ fn test_list_with_branches_flag_only_branches() {
#[test]
fn test_list_with_remotes_flag() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Setup remote creates origin and pushes main to it
repo.setup_remote("main");
@@ -516,7 +502,6 @@ fn test_list_with_remotes_flag() {
#[test]
fn test_list_with_remotes_and_branches() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_remote("main");
// Create local-only branches (not worktrees, not pushed)
@@ -547,7 +532,6 @@ fn test_list_with_remotes_and_branches() {
#[test]
fn test_list_with_remotes_filters_existing_worktrees() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_remote("main");
// Create a worktree and push the branch
@@ -778,7 +762,6 @@ fn test_list_with_upstream_tracking() {
#[test]
fn test_list_primary_on_different_branch() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.switch_primary_to("develop");
assert_eq!(repo.current_branch(), "develop");
@@ -948,7 +931,6 @@ fn test_list_json_with_git_operation() {
fn test_list_branch_only_with_status() {
// Test that branch-only entries (no worktree) can display branch-keyed status
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a branch-only entry (no worktree)
let mut cmd = Command::new("git");
@@ -973,7 +955,6 @@ fn test_list_branch_only_with_status() {
#[test]
fn test_list_user_marker_with_special_characters() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Test with single emoji
repo.add_worktree("emoji");
@@ -1911,7 +1892,6 @@ fn test_readme_example_list_branches() {
#[test]
fn test_list_progressive_flag() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature-a");
repo.add_worktree("feature-b");
@@ -1923,7 +1903,6 @@ fn test_list_progressive_flag() {
#[test]
fn test_list_no_progressive_flag() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature");
// Explicitly force buffered mode
@@ -1933,7 +1912,6 @@ fn test_list_no_progressive_flag() {
#[test]
fn test_list_progressive_with_branches() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktrees
repo.add_worktree("feature-a");
@@ -1954,7 +1932,6 @@ fn test_list_progressive_with_branches() {
#[test]
fn test_list_task_dag_single_worktree() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
snapshot_list_task_dag("task_dag_single_worktree", &repo);
}
@@ -1962,7 +1939,6 @@ fn test_list_task_dag_single_worktree() {
#[test]
fn test_list_task_dag_multiple_worktrees() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature-a");
repo.add_worktree("feature-b");
@@ -1974,7 +1950,6 @@ fn test_list_task_dag_multiple_worktrees() {
#[test]
fn test_list_task_dag_full_with_diffs() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktree with changes
let feature_a = repo.add_worktree("feature-a");
@@ -2039,7 +2014,6 @@ fn test_list_task_dag_with_upstream() {
#[test]
fn test_list_task_dag_many_worktrees() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create 10 worktrees to test parallel processing
for i in 1..=10 {
@@ -2052,7 +2026,6 @@ fn test_list_task_dag_many_worktrees() {
#[test]
fn test_list_task_dag_with_locked_worktree() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("normal");
repo.add_worktree("locked");
@@ -2064,7 +2037,6 @@ fn test_list_task_dag_with_locked_worktree() {
#[test]
fn test_list_task_dag_detached_head() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
repo.detach_head();
snapshot_list_task_dag("task_dag_detached_head", &repo);
@@ -2098,7 +2070,6 @@ fn test_list_progressive_vs_buffered_identical_data() {
// - The DATA must be identical, but table formatting may differ slightly
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create varied worktrees to test multiple data points
repo.add_worktree("feature-a");
@@ -2148,7 +2119,6 @@ fn test_list_progressive_vs_buffered_identical_data() {
#[test]
fn test_list_with_c_flag() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create some worktrees
repo.add_worktree("feature-a");
@@ -2170,7 +2140,6 @@ fn test_list_with_c_flag() {
#[test]
fn test_list_large_diffs_alignment() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Worktree with large uncommitted changes and ahead commits
// Use a longer branch name similar to user's "wli-sequence" to trigger column width
@@ -2278,7 +2247,6 @@ fn test_list_large_diffs_alignment() {
#[test]
fn test_list_status_column_padding_with_emoji() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktree matching user's exact scenario: "wli-sequence"
let wli_seq = repo.add_worktree("wli-sequence");
@@ -2385,7 +2353,6 @@ fn test_list_maximum_working_tree_symbols() {
// ? (untracked), ! (modified), + (staged), » (renamed), ✘ (deleted)
// This verifies the maximum width of the working_tree position (5 chars)
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
let feature = repo.add_worktree("feature");
@@ -2729,7 +2696,6 @@ fn test_list_maximum_status_symbols() {
#[test]
fn test_list_warns_when_default_branch_missing_worktree() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Move primary worktree off the default branch so no worktree holds it
repo.switch_primary_to("develop");
diff --git a/tests/integration_tests/list_column_alignment.rs b/tests/integration_tests/list_column_alignment.rs
index 7dd86c6fd..e2c206cd0 100644
--- a/tests/integration_tests/list_column_alignment.rs
+++ b/tests/integration_tests/list_column_alignment.rs
@@ -10,7 +10,6 @@ use insta_cmd::assert_cmd_snapshot;
#[test]
fn test_status_column_alignment_with_header() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktree with status symbols
let wt = repo.add_worktree("test");
@@ -43,7 +42,6 @@ fn test_status_column_alignment_with_header() {
#[test]
fn test_status_column_width_consistency() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create multiple worktrees with different status symbol combinations
let wt1 = repo.add_worktree("simple");
diff --git a/tests/integration_tests/list_config.rs b/tests/integration_tests/list_config.rs
index aff5a2ade..4cfef6ea6 100644
--- a/tests/integration_tests/list_config.rs
+++ b/tests/integration_tests/list_config.rs
@@ -9,7 +9,6 @@ use tempfile::TempDir;
#[test]
fn test_list_config_full_enabled() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let temp_home = TempDir::new().unwrap();
// Create user config with list.full = true
@@ -40,7 +39,6 @@ full = true
#[test]
fn test_list_config_branches_enabled() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a branch without a worktree
let mut cmd = std::process::Command::new("git");
@@ -80,7 +78,6 @@ branches = true
#[test]
fn test_list_config_cli_override() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a branch without a worktree
let mut cmd = std::process::Command::new("git");
@@ -123,7 +120,6 @@ branches = false
#[test]
fn test_list_config_full_and_branches() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a branch without a worktree
let mut cmd = std::process::Command::new("git");
@@ -164,7 +160,6 @@ branches = true
#[test]
fn test_list_no_config() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a branch without a worktree
let mut cmd = std::process::Command::new("git");
diff --git a/tests/integration_tests/list_progressive.rs b/tests/integration_tests/list_progressive.rs
index f69fb5299..5da940fc7 100644
--- a/tests/integration_tests/list_progressive.rs
+++ b/tests/integration_tests/list_progressive.rs
@@ -10,7 +10,6 @@ use crate::common::progressive_output::{ProgressiveCaptureOptions, capture_progr
#[test]
fn test_list_progressive_rendering_basic() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a few worktrees to have data to render
repo.add_worktree("feature-a");
@@ -59,7 +58,6 @@ fn test_list_progressive_rendering_basic() {
#[test]
fn test_list_progressive_dots_decrease() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create multiple worktrees to ensure progressive rendering is observable
for i in 1..=5 {
@@ -80,7 +78,6 @@ fn test_list_progressive_dots_decrease() {
#[test]
fn test_list_progressive_timing() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature");
let output = capture_progressive_output(
@@ -109,7 +106,6 @@ fn test_list_progressive_timing() {
#[test]
fn test_list_progressive_snapshot_at() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature");
let output = capture_progressive_output(
@@ -139,7 +135,6 @@ fn test_list_progressive_snapshot_at() {
#[test]
fn test_list_progressive_many_worktrees() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create many worktrees to ensure rendering takes time
for i in 1..=10 {
@@ -185,7 +180,6 @@ fn test_list_progressive_many_worktrees() {
#[test]
fn test_list_progressive_fast_command() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Run list without any worktrees (fast)
let output = capture_progressive_output(
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 1a468727e..516ac1a88 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -47,7 +47,6 @@ fn snapshot_merge_with_env(
/// specifically need remote behavior should call `repo.setup_remote()` explicitly.
fn setup_merge_scenario() -> (TestRepo, std::path::PathBuf) {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -83,7 +82,6 @@ fn setup_merge_scenario() -> (TestRepo, std::path::PathBuf) {
/// Returns (repo, feature_wt_path).
fn setup_merge_scenario_multi_commit() -> (TestRepo, std::path::PathBuf) {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -139,7 +137,6 @@ fn test_merge_fast_forward() {
#[test]
fn test_merge_when_primary_not_on_default_but_default_has_worktree() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Move the primary worktree off main
repo.switch_primary_to("develop");
@@ -189,7 +186,6 @@ fn test_merge_with_no_remove_flag() {
#[test]
fn test_merge_already_on_target() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Already on main branch (repo root)
snapshot_merge("merge_already_on_target", &repo, &[], None);
@@ -198,7 +194,6 @@ fn test_merge_already_on_target() {
#[test]
fn test_merge_dirty_working_tree() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a feature worktree with uncommitted changes
let feature_wt = repo.add_worktree("feature");
@@ -216,7 +211,6 @@ fn test_merge_dirty_working_tree() {
#[test]
fn test_merge_not_fast_forward() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create commits in both branches
// Add commit to main (repo root)
@@ -269,7 +263,6 @@ fn test_merge_not_fast_forward() {
#[test]
fn test_merge_no_commit_not_fast_forward() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Get the initial commit SHA to create feature branch from there
let mut cmd = Command::new("git");
@@ -451,7 +444,6 @@ fn test_merge_with_caret_symbol() {
#[test]
fn test_merge_error_detached_head() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Detach HEAD in the repo
repo.detach_head();
@@ -468,7 +460,6 @@ fn test_merge_error_detached_head() {
#[test]
fn test_merge_squash_deterministic() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -536,7 +527,6 @@ fn test_merge_squash_deterministic() {
#[test]
fn test_merge_squash_with_llm() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -594,7 +584,6 @@ args = ["-c", "cat >/dev/null && echo 'feat: implement user authentication syste
#[test]
fn test_merge_squash_llm_command_not_found() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -653,7 +642,6 @@ fn test_merge_squash_llm_command_not_found() {
fn test_merge_squash_llm_error() {
// Test that LLM command errors show proper gutter formatting with full command
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -719,7 +707,6 @@ args = ["-c", "cat > /dev/null; echo 'Error: connection refused' >&2 && exit 1"]
#[test]
fn test_merge_squash_single_commit() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -772,7 +759,6 @@ fn test_merge_no_squash() {
#[test]
fn test_merge_squash_empty_changes() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -847,7 +833,6 @@ fn test_merge_squash_empty_changes() {
#[test]
fn test_merge_auto_commit_deterministic() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -891,7 +876,6 @@ fn test_merge_auto_commit_deterministic() {
#[test]
fn test_merge_auto_commit_with_llm() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -969,7 +953,6 @@ args = ["-c", "cat >/dev/null && echo 'fix: update file 1 content'"]
#[test]
fn test_merge_with_untracked_files() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -1018,7 +1001,6 @@ fn test_merge_with_untracked_files() {
#[test]
fn test_merge_pre_merge_command_success() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with pre-merge command
let config_dir = repo.root_path().join(".config");
@@ -1068,7 +1050,6 @@ fn test_merge_pre_merge_command_success() {
#[test]
fn test_merge_pre_merge_command_failure() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with failing pre-merge command
let config_dir = repo.root_path().join(".config");
@@ -1116,7 +1097,6 @@ fn test_merge_pre_merge_command_failure() {
#[test]
fn test_merge_pre_merge_command_no_hooks() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with failing pre-merge command
let config_dir = repo.root_path().join(".config");
@@ -1166,7 +1146,6 @@ fn test_merge_pre_merge_command_no_hooks() {
#[test]
fn test_merge_pre_merge_command_named() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with named pre-merge commands
let config_dir = repo.root_path().join(".config");
@@ -1225,7 +1204,6 @@ test = "exit 0"
#[test]
fn test_merge_post_merge_command_success() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-merge command that writes a marker file
let config_dir = repo.root_path().join(".config");
@@ -1290,7 +1268,6 @@ fn test_merge_post_merge_command_success() {
#[test]
fn test_merge_post_merge_command_skipped_with_no_verify() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-merge command that writes a marker file
let config_dir = repo.root_path().join(".config");
@@ -1351,7 +1328,6 @@ fn test_merge_post_merge_command_skipped_with_no_verify() {
#[test]
fn test_merge_post_merge_command_failure() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with failing post-merge command
let config_dir = repo.root_path().join(".config");
@@ -1401,7 +1377,6 @@ fn test_merge_post_merge_command_failure() {
#[test]
fn test_merge_post_merge_command_named() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with named post-merge commands
let config_dir = repo.root_path().join(".config");
@@ -1472,7 +1447,6 @@ deploy = "echo 'Deploying branch {{ branch }}' > deploy.txt"
fn test_merge_post_merge_runs_with_nothing_to_merge() {
// Verify post-merge hooks run even when there's nothing to merge
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-merge command
let config_dir = repo.root_path().join(".config");
@@ -1519,7 +1493,6 @@ fn test_merge_post_merge_runs_with_nothing_to_merge() {
fn test_merge_post_merge_runs_from_main_branch() {
// Verify post-merge hooks run when merging from main to main (nothing to do)
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-merge command
let config_dir = repo.root_path().join(".config");
@@ -1553,7 +1526,6 @@ fn test_merge_post_merge_runs_from_main_branch() {
#[test]
fn test_merge_pre_commit_command_success() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with pre-commit command
let config_dir = repo.root_path().join(".config");
@@ -1593,7 +1565,6 @@ fn test_merge_pre_commit_command_success() {
#[test]
fn test_merge_pre_commit_command_failure() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with failing pre-commit command
let config_dir = repo.root_path().join(".config");
@@ -1629,7 +1600,6 @@ fn test_merge_pre_commit_command_failure() {
#[test]
fn test_merge_pre_squash_command_success() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with pre-commit command (used for both squash and no-squash)
let config_dir = repo.root_path().join(".config");
@@ -1683,7 +1653,6 @@ fn test_merge_pre_squash_command_success() {
#[test]
fn test_merge_pre_squash_command_failure() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with failing pre-commit command (used for both squash and no-squash)
let config_dir = repo.root_path().join(".config");
@@ -1731,7 +1700,6 @@ fn test_merge_pre_squash_command_failure() {
#[test]
fn test_merge_no_remote() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Deliberately NOT calling setup_remote to test the error case
// Create a feature worktree and make a commit
@@ -1773,7 +1741,6 @@ fn test_merge_no_remote() {
#[cfg_attr(windows, ignore)]
fn test_readme_example_simple() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Snapshot the switch --create command (runs from bare repo)
snapshot_switch(
@@ -1831,7 +1798,6 @@ pub fn refresh(refresh_token: &str) -> String {
#[cfg_attr(windows, ignore)]
fn test_readme_example_complex() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with multiple hooks
let config_dir = repo.root_path().join(".config");
@@ -2070,7 +2036,6 @@ command = "{}"
#[cfg_attr(windows, ignore)]
fn test_readme_example_hooks_post_create() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-create and post-start hooks
let config_dir = repo.root_path().join(".config");
@@ -2158,7 +2123,6 @@ fi
#[cfg_attr(windows, ignore)]
fn test_readme_example_hooks_pre_merge() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with pre-merge hooks
let config_dir = repo.root_path().join(".config");
@@ -2413,7 +2377,6 @@ command = "{}"
#[test]
fn test_merge_no_commit_with_clean_tree() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -2457,8 +2420,8 @@ fn test_merge_no_commit_with_clean_tree() {
----- stdout -----
----- stderr -----
- 🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-   * 6551244 Add feature file
+ 🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+   * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
@@ -2470,7 +2433,6 @@ fn test_merge_no_commit_with_clean_tree() {
#[test]
fn test_merge_no_commit_with_dirty_tree() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a feature worktree with a commit
let feature_wt = repo.add_worktree("feature");
@@ -2514,7 +2476,6 @@ fn test_merge_no_commit_with_dirty_tree() {
#[test]
fn test_merge_no_commit_no_squash_no_remove_redundant() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -2558,8 +2519,8 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
----- stdout -----
----- stderr -----
- 🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-   * 6551244 Add feature file
+ 🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+   * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
@@ -2571,7 +2532,6 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
#[test]
fn test_merge_no_commits() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
repo.add_main_worktree();
@@ -2586,7 +2546,6 @@ fn test_merge_no_commits() {
#[test]
fn test_merge_no_commits_with_changes() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
repo.add_main_worktree();
@@ -2609,7 +2568,6 @@ fn test_merge_rebase_fast_forward() {
// Test fast-forward case: branch has no commits, main moved ahead
// Should show "Fast-forwarded to main" without progress message
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a feature worktree with NO commits (just branched from main)
let feature_wt = repo.add_worktree("fast-forward-test");
@@ -2645,7 +2603,6 @@ fn test_merge_rebase_true_rebase() {
// Test true rebase case: branch has commits and main moved ahead
// Should show "Rebasing onto main..." progress message
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a feature worktree with a commit
let feature_wt = repo.add_worktree("true-rebase-test");
@@ -2694,7 +2651,6 @@ fn test_merge_rebase_true_rebase() {
#[test]
fn test_merge_primary_on_different_branch() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.switch_primary_to("develop");
assert_eq!(repo.current_branch(), "develop");
@@ -2731,7 +2687,6 @@ fn test_merge_primary_on_different_branch() {
#[test]
fn test_merge_primary_on_different_branch_dirty() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Make main and develop diverge - modify file.txt on main
fs::write(repo.root_path().join("file.txt"), "main version").unwrap();
@@ -2801,7 +2756,6 @@ fn test_merge_primary_on_different_branch_dirty() {
#[test]
fn test_merge_race_condition_commit_after_push() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -2908,7 +2862,6 @@ fn test_merge_race_condition_commit_after_push() {
#[test]
fn test_merge_to_non_default_target() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Switch back to main and add a commit there
let mut cmd = Command::new("git");
@@ -3023,7 +2976,6 @@ fn test_merge_to_non_default_target() {
#[test]
fn test_merge_squash_with_working_tree_creates_backup() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
repo.add_main_worktree();
@@ -3098,7 +3050,6 @@ fn test_merge_squash_with_working_tree_creates_backup() {
#[test]
fn test_merge_when_default_branch_missing_worktree() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Move primary off default branch so no worktree holds it
repo.switch_primary_to("develop");
@@ -3189,7 +3140,6 @@ fn snapshot_step_commit_with_env(
#[test]
fn test_step_squash_with_no_verify_flag() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a feature worktree with multiple commits
let feature_wt = repo.add_worktree("feature");
@@ -3250,7 +3200,6 @@ fn test_step_squash_with_no_verify_flag() {
#[test]
fn test_step_squash_with_stage_tracked_flag() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
let feature_wt = repo.add_worktree("feature");
@@ -3303,7 +3252,6 @@ fn test_step_squash_with_stage_tracked_flag() {
#[test]
fn test_step_squash_with_both_flags() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
let feature_wt = repo.add_worktree("feature");
@@ -3366,7 +3314,6 @@ fn test_step_squash_with_both_flags() {
fn test_step_squash_no_commits() {
// Test "nothing to squash; no commits ahead" message
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a feature worktree but don't add any commits
let feature_wt = repo.add_worktree("feature");
@@ -3378,7 +3325,6 @@ fn test_step_squash_no_commits() {
fn test_step_squash_single_commit() {
// Test "nothing to squash; already a single commit" message
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a feature worktree with exactly one commit
let feature_wt = repo.add_worktree("feature");
@@ -3409,7 +3355,6 @@ fn test_step_squash_single_commit() {
#[test]
fn test_step_commit_with_no_verify_flag() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Add a pre-commit hook so --no-verify has something to skip
fs::create_dir_all(repo.root_path().join(".config")).expect("Failed to create .config");
@@ -3436,7 +3381,6 @@ fn test_step_commit_with_no_verify_flag() {
#[test]
fn test_step_commit_with_stage_tracked_flag() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
fs::write(repo.root_path().join("tracked.txt"), "initial").expect("Failed to write file");
repo.commit("add tracked file");
@@ -3466,7 +3410,6 @@ fn test_step_commit_with_stage_tracked_flag() {
#[test]
fn test_step_commit_with_both_flags() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Add a pre-commit hook so --no-verify has something to skip
fs::create_dir_all(repo.root_path().join(".config")).expect("Failed to create .config");
@@ -3496,7 +3439,6 @@ fn test_step_commit_with_both_flags() {
#[test]
fn test_step_commit_nothing_to_commit() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// No changes made - commit should fail with "nothing to commit"
snapshot_step_commit_with_env(
@@ -3522,7 +3464,6 @@ fn test_step_commit_nothing_to_commit() {
fn test_merge_error_uncommitted_changes_with_no_commit() {
// Tests the `uncommitted_changes()` error function when using --no-commit with dirty tree
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -3553,7 +3494,6 @@ fn test_merge_error_conflicting_changes_in_target() {
// Tests the `conflicting_changes()` error function when target worktree has
// uncommitted changes that overlap with files being pushed
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Switch primary worktree off main so we can create a worktree for main
repo.switch_primary_to("develop");
diff --git a/tests/integration_tests/post_start_commands.rs b/tests/integration_tests/post_start_commands.rs
index a3f0fc57d..5d6fe6ea8 100644
--- a/tests/integration_tests/post_start_commands.rs
+++ b/tests/integration_tests/post_start_commands.rs
@@ -39,7 +39,6 @@ fn snapshot_switch(test_name: &str, repo: &TestRepo, args: &[&str]) {
#[test]
fn test_post_create_no_config() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Switch without project config should work normally
snapshot_switch("post_create_no_config", &repo, &["--create", "feature"]);
@@ -50,7 +49,6 @@ fn test_post_create_no_config() {
#[test]
fn test_post_create_single_command() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with a single command (string format)
repo.write_project_config(r#"post-create = "echo 'Setup complete'""#);
@@ -79,7 +77,6 @@ approved-commands = ["echo 'Setup complete'"]
#[test]
fn test_post_create_named_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with named commands (table format)
repo.write_project_config(
@@ -116,7 +113,6 @@ approved-commands = [
#[test]
fn test_post_create_failing_command() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with a command that will fail
repo.write_project_config(r#"post-create = "exit 1""#);
@@ -145,7 +141,6 @@ approved-commands = ["exit 1"]
#[test]
fn test_post_create_template_expansion() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with template variables
repo.write_project_config(
@@ -214,7 +209,6 @@ approved-commands = [
#[test]
fn test_post_create_default_branch_template() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with default_branch template variable
repo.write_project_config(
@@ -261,7 +255,6 @@ approved-commands = ["echo 'Default: {{ default_branch }}' > default.txt"]
#[test]
fn test_post_create_git_variables_template() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_remote("main");
// Set up an upstream tracking branch
@@ -339,7 +332,6 @@ worktree_name = "echo 'Worktree Name: {{ worktree_name }}' >> git_vars.txt"
#[test]
fn test_post_create_upstream_template() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.setup_remote("main");
// Push main to set up tracking
@@ -386,7 +378,6 @@ fn test_post_create_json_stdin() {
use crate::common::wt_command;
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with a command that reads JSON from stdin
// Use cat to capture stdin to a file
@@ -472,7 +463,6 @@ fn test_post_create_script_reads_json() {
use std::os::unix::fs::PermissionsExt;
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a scripts directory and a Python script that reads JSON from stdin
let scripts_dir = repo.root_path().join("scripts");
@@ -574,7 +564,6 @@ fn test_post_start_json_stdin() {
use crate::common::wt_command;
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with a background command that reads JSON from stdin
repo.write_project_config(r#"post-start = "cat > context.json""#);
@@ -638,7 +627,6 @@ approved-commands = ["cat > context.json"]
#[test]
fn test_post_start_single_background_command() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with a background command
repo.write_project_config(
@@ -679,7 +667,6 @@ approved-commands = ["sleep 0.1 && echo 'Background task done' > background.txt"
#[test]
fn test_post_start_multiple_background_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with multiple background commands (table format)
repo.write_project_config(
@@ -727,7 +714,6 @@ approved-commands = [
#[test]
fn test_both_post_create_and_post_start() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with both command types
repo.write_project_config(
@@ -772,7 +758,6 @@ approved-commands = [
#[test]
fn test_invalid_toml() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create invalid TOML
repo.write_project_config("post-create = [invalid syntax\n");
@@ -792,7 +777,6 @@ fn test_invalid_toml() {
#[test]
fn test_post_start_log_file_captures_output() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create command that writes to both stdout and stderr
repo.write_project_config(r#"post-start = "echo 'stdout output' && echo 'stderr output' >&2""#);
@@ -851,7 +835,6 @@ approved-commands = ["echo 'stdout output' && echo 'stderr output' >&2"]
#[test]
fn test_post_start_invalid_command_handling() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create command with syntax error (missing quote)
repo.write_project_config(r#"post-start = "echo 'unclosed quote""#);
@@ -887,7 +870,6 @@ approved-commands = ["echo 'unclosed quote"]
#[test]
fn test_post_start_multiple_commands_separate_logs() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create multiple background commands with distinct output
repo.write_project_config(
@@ -973,7 +955,6 @@ approved-commands = [
#[test]
fn test_execute_flag_with_post_start_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create post-start command
repo.write_project_config(r#"post-start = "echo 'Background task' > background.txt""#);
@@ -1021,7 +1002,6 @@ approved-commands = ["echo 'Background task' > background.txt"]
#[test]
fn test_post_start_complex_shell_commands() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create command with pipes and redirects
repo.write_project_config(
@@ -1055,7 +1035,6 @@ approved-commands = ["echo 'line1\nline2\nline3' | grep line2 > filtered.txt"]
#[test]
fn test_post_start_multiline_commands_with_newlines() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create command with actual newlines (using TOML triple-quoted string)
repo.write_project_config(
@@ -1108,7 +1087,6 @@ approved-commands = ["""
#[test]
fn test_post_create_multiline_with_control_structures() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Test multiline command with if-else control structure
repo.write_project_config(
@@ -1172,7 +1150,6 @@ approved-commands = ["""
#[test]
fn test_post_start_skipped_on_existing_worktree() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-start command
repo.write_project_config(r#"post-start = "echo 'POST-START-RAN' > post_start_marker.txt""#);
diff --git a/tests/integration_tests/push.rs b/tests/integration_tests/push.rs
index b2149f69c..e534302a9 100644
--- a/tests/integration_tests/push.rs
+++ b/tests/integration_tests/push.rs
@@ -17,7 +17,6 @@ fn snapshot_push(test_name: &str, repo: &TestRepo, args: &[&str], cwd: Option<&s
#[test]
fn test_push_fast_forward() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree for main (checking out existing branch)
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
@@ -53,7 +52,6 @@ fn test_push_fast_forward() {
#[test]
fn test_push_not_fast_forward() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create commits in both worktrees
// The repo root is already the main worktree
@@ -97,7 +95,6 @@ fn test_push_not_fast_forward() {
#[test]
fn test_push_to_default_branch() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
let main_wt = repo.root_path().parent().unwrap().join("repo.main-wt");
let mut cmd = Command::new("git");
@@ -131,7 +128,6 @@ fn test_push_to_default_branch() {
#[test]
fn test_push_with_dirty_target() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Make main worktree (repo root) dirty with a conflicting file
std::fs::write(repo.root_path().join("conflict.txt"), "old content").unwrap();
@@ -182,7 +178,6 @@ fn test_push_with_dirty_target() {
#[test]
fn test_push_dirty_target_autostash() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Make main worktree (repo root) dirty with a non-conflicting file
std::fs::write(repo.root_path().join("notes.txt"), "temporary notes").unwrap();
@@ -234,7 +229,6 @@ fn test_push_dirty_target_autostash() {
#[test]
fn test_push_error_not_fast_forward() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature branch from initial commit
let feature_wt = repo.add_worktree("feature");
@@ -292,7 +286,6 @@ fn test_push_error_not_fast_forward() {
#[test]
fn test_push_error_with_merge_commits() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature branch
let feature_wt = repo.add_worktree("feature");
@@ -363,7 +356,6 @@ fn test_push_error_with_merge_commits() {
#[test]
fn test_push_with_merge_commits_allowed() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature branch
let feature_wt = repo.add_worktree("feature");
@@ -434,7 +426,6 @@ fn test_push_with_merge_commits_allowed() {
#[test]
fn test_push_no_remote() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Deliberately NOT calling setup_remote to test the error case
// Create a feature worktree and make a commit
diff --git a/tests/integration_tests/remove.rs b/tests/integration_tests/remove.rs
index e7228b047..81e35e647 100644
--- a/tests/integration_tests/remove.rs
+++ b/tests/integration_tests/remove.rs
@@ -30,9 +30,7 @@ fn snapshot_remove_with_global_flags(
/// Common setup for remove tests - creates repo with initial commit and remote
fn setup_remove_repo() -> TestRepo {
- let repo = TestRepo::new();
- repo.commit("Initial commit");
- repo
+ TestRepo::new()
}
#[test]
@@ -769,7 +767,6 @@ fn test_remove_squash_merged_then_main_advanced() {
fn test_pre_remove_hook_executes() {
// Use simple repo without remote for predictable project ID
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with pre-remove hook
repo.write_project_config(r#"pre-remove = "echo 'About to remove worktree'""#);
@@ -803,7 +800,6 @@ approved-commands = ["echo 'About to remove worktree'"]
fn test_pre_remove_hook_template_variables() {
// Use simple repo without remote for predictable project ID
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with template variables
repo.write_project_config(
@@ -849,7 +845,6 @@ fn test_pre_remove_hook_runs_in_background_mode() {
// Use simple repo without remote for predictable project ID
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a marker file that the hook will create
let marker_file = repo.root_path().join("hook-ran.txt");
@@ -899,7 +894,6 @@ approved-commands = ["echo 'hook ran' > {}"]
fn test_pre_remove_hook_failure_aborts() {
// Use simple repo without remote for predictable project ID
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with failing hook
repo.write_project_config(r#"pre-remove = "exit 1""#);
@@ -937,7 +931,6 @@ approved-commands = ["exit 1"]
fn test_pre_remove_hook_not_for_branch_only() {
// Use simple repo without remote for predictable project ID
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a marker file that the hook would create
let marker_file = repo.root_path().join("branch-only-hook.txt");
@@ -986,7 +979,6 @@ fn test_pre_remove_hook_skipped_with_no_verify() {
// Use simple repo without remote for predictable project ID
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a marker file that the hook would create
let marker_file = repo.root_path().join("should-not-exist.txt");
@@ -1045,7 +1037,6 @@ approved-commands = ["echo 'hook ran' > {}"]
#[cfg_attr(windows, ignore)]
fn test_pre_remove_hook_runs_for_detached_head() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create marker file path in the repo root
// Use short filename to avoid terminal line-wrapping differences between platforms
@@ -1094,7 +1085,6 @@ approved-commands = ["touch {marker_path}"]
#[test]
fn test_pre_remove_hook_runs_for_detached_head_background() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create marker file path in the repo root
let marker_file = repo.root_path().join("detached-bg-hook-marker.txt");
@@ -1144,7 +1134,6 @@ approved-commands = ["touch {marker_path}"]
#[cfg_attr(windows, ignore)]
fn test_pre_remove_hook_branch_expansion_detached_head() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a file where the hook will write the branch template expansion
let branch_file = repo.root_path().join("branch-expansion.txt");
diff --git a/tests/integration_tests/security.rs b/tests/integration_tests/security.rs
index 0ad64bd50..a97d58a26 100644
--- a/tests/integration_tests/security.rs
+++ b/tests/integration_tests/security.rs
@@ -110,7 +110,6 @@ fn test_git_rejects_nul_in_commit_messages() {
use std::process::Stdio;
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Try to create a commit with NUL in the message
// We can't use Command::arg() because Rust rejects NUL bytes,
@@ -164,7 +163,6 @@ fn test_git_rejects_nul_in_commit_messages() {
#[test]
fn test_rust_prevents_nul_bytes_in_args() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Rust's Command API should reject NUL bytes in arguments
let malicious_branch = "feature\0__WORKTRUNK_EXEC__echo PWNED";
@@ -202,7 +200,6 @@ fn test_rust_prevents_nul_bytes_in_args() {
#[test]
fn test_branch_name_is_directive_not_executed() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let malicious_branch = "__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked2";
@@ -245,7 +242,6 @@ fn test_branch_name_is_directive_not_executed() {
#[test]
fn test_branch_name_with_newline_directive_not_executed() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let malicious_branch = "feature\n__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked3";
@@ -327,7 +323,6 @@ fn test_path_with_directive_not_executed() {
use crate::common::setup_snapshot_settings;
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a directory with a malicious name
let malicious_dir = repo
@@ -358,7 +353,6 @@ fn test_path_with_directive_not_executed() {
#[test]
fn test_branch_name_with_cd_directive_not_executed() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Branch name that IS a CD directive (no NUL - git allows this)
let malicious_branch = "__WORKTRUNK_CD__/tmp";
@@ -397,7 +391,6 @@ fn test_branch_name_with_cd_directive_not_executed() {
#[test]
fn test_error_message_with_directive_not_executed() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Try to switch to a non-existent branch with a name that looks like a directive
let malicious_branch = "__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6";
@@ -430,7 +423,6 @@ fn test_error_message_with_directive_not_executed() {
#[test]
fn test_execute_flag_with_directive_like_branch_name() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Branch name that looks like a directive
let malicious_branch = "__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked7";
diff --git a/tests/integration_tests/select.rs b/tests/integration_tests/select.rs
index 89aaa0530..2667c1633 100644
--- a/tests/integration_tests/select.rs
+++ b/tests/integration_tests/select.rs
@@ -344,7 +344,6 @@ fn normalize_output(output: &str) -> String {
fn test_select_abort_with_escape() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let env_vars = repo.test_env_vars();
let (raw_output, exit_code) = exec_in_pty_with_input(
@@ -366,7 +365,6 @@ fn test_select_abort_with_escape() {
fn test_select_with_multiple_worktrees() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("feature-one");
repo.add_worktree("feature-two");
@@ -390,7 +388,6 @@ fn test_select_with_multiple_worktrees() {
fn test_select_with_branches() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
repo.add_worktree("active-worktree");
// Create a branch without a worktree
let output = repo
@@ -420,7 +417,6 @@ fn test_select_with_branches() {
fn test_select_preview_panel_uncommitted() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
let feature_path = repo.add_worktree("feature");
// First, create and commit a file so we have something to modify
@@ -476,7 +472,6 @@ fn test_select_preview_panel_uncommitted() {
fn test_select_preview_panel_log() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
let feature_path = repo.add_worktree("feature");
// Make several commits in the feature worktree
@@ -531,7 +526,6 @@ fn test_select_preview_panel_log() {
fn test_select_preview_panel_main_diff() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
let feature_path = repo.add_worktree("feature");
// Make commits in the feature worktree that differ from main
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index 4f225e72e..69af0a86e 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -702,7 +702,6 @@ mod tests {
fn test_wrapper_handles_command_failure(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree that already exists
repo.add_worktree("existing");
@@ -737,7 +736,6 @@ mod tests {
fn test_wrapper_switch_create(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = exec_through_wrapper(shell, &repo, "switch", &["--create", "feature"]);
@@ -747,7 +745,7 @@ mod tests {
output.assert_no_job_control_messages();
assert!(
- output.combined.contains("Created worktree"),
+ output.combined.contains("Created new worktree"),
"{}: Should show success message",
shell
);
@@ -765,7 +763,6 @@ mod tests {
fn test_wrapper_remove(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree to remove
repo.add_worktree("to-remove");
@@ -849,7 +846,6 @@ mod tests {
fn test_wrapper_merge(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a feature branch
repo.add_worktree("feature");
@@ -873,7 +869,6 @@ mod tests {
fn test_wrapper_switch_with_execute(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Use --force to skip approval prompt in tests
let output = exec_through_wrapper(
@@ -915,7 +910,6 @@ mod tests {
fn test_wrapper_execute_exit_code_propagation(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Use --force to skip approval prompt in tests
// wt should succeed (creates worktree), but the execute command should fail with exit 42
@@ -942,7 +936,7 @@ mod tests {
// Should still show wt's success message (worktree was created)
assert!(
- output.combined.contains("Created worktree"),
+ output.combined.contains("Created new worktree"),
"{}: Should show wt's success message even though execute command failed",
shell
);
@@ -961,7 +955,6 @@ mod tests {
fn test_wrapper_switch_with_hooks(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with both post-create and post-start hooks
let config_dir = repo.root_path().join(".config");
@@ -1018,7 +1011,6 @@ approved-commands = [
fn test_wrapper_merge_with_pre_merge_success(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with pre-merge validation
let config_dir = repo.root_path().join(".config");
@@ -1100,7 +1092,6 @@ approved-commands = [
fn test_wrapper_merge_with_pre_merge_failure(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with failing pre-merge validation
let config_dir = repo.root_path().join(".config");
@@ -1180,7 +1171,6 @@ approved-commands = [
fn test_wrapper_merge_with_mixed_stdout_stderr(#[case] shell: &str) {
skip_if_shell_unavailable!(shell);
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Copy the fixture script to the test repo to avoid path issues with special characters
// (CARGO_MANIFEST_DIR may contain single quotes like worktrunk.'∅' which break shell parsing)
@@ -1282,7 +1272,6 @@ approved-commands = [
#[test]
fn test_switch_with_post_start_command_no_directive_leak() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Configure a post-start command in the project config (this is where the bug manifests)
// The println! in handle_post_start_commands causes directive leaks
@@ -1326,7 +1315,6 @@ approved-commands = ["echo 'test command executed'"]
#[test]
fn test_switch_with_execute_through_wrapper() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Use --force to skip approval prompt in tests
let output = exec_through_wrapper(
@@ -1361,7 +1349,6 @@ approved-commands = ["echo 'test command executed'"]
#[test]
fn test_bash_shell_integration_hint_suppressed() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// When running through the shell wrapper, the "To enable automatic cd" hint
// should NOT appear because the user already has shell integration
@@ -1376,7 +1363,7 @@ approved-commands = ["echo 'test command executed'"]
// Should still have the success message
assert!(
- output.combined.contains("Created worktree"),
+ output.combined.contains("Created new worktree"),
"Success message missing"
);
@@ -1386,7 +1373,6 @@ approved-commands = ["echo 'test command executed'"]
#[test]
fn test_readme_example_simple_switch() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktree through shell wrapper (suppresses hint)
let output = exec_through_wrapper("bash", &repo, "switch", &["--create", "fix-auth"]);
@@ -1402,7 +1388,6 @@ approved-commands = ["echo 'test command executed'"]
#[test]
fn test_readme_example_switch_back() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktrees (fix-auth is where we are after step 2, feature-api exists from earlier)
exec_through_wrapper("bash", &repo, "switch", &["--create", "fix-auth"]);
@@ -1425,7 +1410,6 @@ approved-commands = ["echo 'test command executed'"]
#[test]
fn test_readme_example_remove() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktrees
exec_through_wrapper("bash", &repo, "switch", &["--create", "fix-auth"]);
@@ -1446,7 +1430,6 @@ approved-commands = ["echo 'test command executed'"]
#[test]
fn test_wrapper_preserves_progress_messages() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Configure a post-start background command that will trigger progress output
let config_dir = repo.root_path().join(".config");
@@ -1514,7 +1497,6 @@ approved-commands = ["echo 'background task'"]
#[test]
fn test_fish_wrapper_preserves_progress_messages() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Configure a post-start background command that will trigger progress output
let config_dir = repo.root_path().join(".config");
@@ -1566,7 +1548,6 @@ approved-commands = ["echo 'fish background task'"]
#[test]
fn test_fish_multiline_command_execution() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Test that Fish wrapper handles multi-line commands correctly
// This tests Fish's NUL-byte parsing with embedded newlines
@@ -1605,7 +1586,6 @@ approved-commands = ["echo 'fish background task'"]
#[test]
fn test_fish_wrapper_handles_empty_chunks() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Test edge case: command that produces minimal output
// This verifies Fish's `test -n "$chunk"` check works correctly
@@ -1618,7 +1598,7 @@ approved-commands = ["echo 'fish background task'"]
// Should still show success message
assert!(
- output.combined.contains("Created worktree"),
+ output.combined.contains("Created new worktree"),
"Success message missing from minimal output"
);
@@ -1642,7 +1622,6 @@ approved-commands = ["echo 'fish background task'"]
use std::env;
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Get the worktrunk source directory (where this test is running from)
// This is the directory that contains Cargo.toml with the workspace
@@ -1752,7 +1731,6 @@ approved-commands = ["echo 'fish background task'"]
#[test]
fn test_zsh_no_job_control_notifications() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Configure a post-start command that will trigger background job
let config_dir = repo.root_path().join(".config");
@@ -1807,7 +1785,6 @@ approved-commands = ["echo 'background job'"]
#[test]
fn test_bash_job_control_suppression() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Configure a post-start command that will trigger background job
let config_dir = repo.root_path().join(".config");
@@ -1867,7 +1844,7 @@ approved-commands = ["echo 'bash background'"]
// Verify the command completed successfully
assert!(
- output.contains("Created worktree"),
+ output.contains("Created new worktree"),
"Should show success message.\nOutput:\n{}",
output
);
@@ -1892,7 +1869,6 @@ approved-commands = ["echo 'bash background'"]
#[test]
fn test_bash_completions_registered() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let wt_bin = get_cargo_bin("wt");
let wrapper_script = generate_wrapper(&repo, "bash");
@@ -1932,7 +1908,6 @@ approved-commands = ["echo 'bash background'"]
#[test]
fn test_fish_completions_registered() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let wt_bin = get_cargo_bin("wt");
let wrapper_script = generate_wrapper(&repo, "fish");
@@ -1978,7 +1953,6 @@ approved-commands = ["echo 'bash background'"]
#[test]
fn test_zsh_wrapper_function_registered() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let wt_bin = get_cargo_bin("wt");
let wrapper_script = generate_wrapper(&repo, "zsh");
@@ -2031,7 +2005,6 @@ approved-commands = ["echo 'bash background'"]
#[case("fish")]
fn test_branch_name_with_slashes(#[case] shell: &str) {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Branch name with slashes (common git convention)
let output =
@@ -2041,7 +2014,7 @@ approved-commands = ["echo 'bash background'"]
output.assert_no_directive_leaks();
assert!(
- output.combined.contains("Created worktree"),
+ output.combined.contains("Created new worktree"),
"{}: Should create worktree for branch with slashes",
shell
);
@@ -2054,7 +2027,6 @@ approved-commands = ["echo 'bash background'"]
#[case("fish")]
fn test_branch_name_with_dashes_underscores(#[case] shell: &str) {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let output = exec_through_wrapper(shell, &repo, "switch", &["--create", "fix-bug_123"]);
@@ -2062,7 +2034,7 @@ approved-commands = ["echo 'bash background'"]
output.assert_no_directive_leaks();
assert!(
- output.combined.contains("Created worktree"),
+ output.combined.contains("Created new worktree"),
"{}: Should create worktree for branch with dashes/underscores",
shell
);
@@ -2079,7 +2051,6 @@ approved-commands = ["echo 'bash background'"]
#[case("fish")]
fn test_worktrunk_bin_fallback(#[case] shell: &str) {
let repo = TestRepo::new();
- repo.commit("Initial commit");
let wt_bin = get_cargo_bin("wt");
let wrapper_script = generate_wrapper(&repo, shell);
@@ -2163,7 +2134,7 @@ approved-commands = ["echo 'bash background'"]
output.assert_no_directive_leaks();
assert!(
- output.combined.contains("Created worktree"),
+ output.combined.contains("Created new worktree"),
"{}: Should create worktree using WORKTRUNK_BIN fallback.\nOutput:\n{}",
shell,
output.combined
@@ -2191,7 +2162,6 @@ approved-commands = ["echo 'bash background'"]
#[case("fish")]
fn test_shell_completes_cleanly(#[case] shell: &str) {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Configure a post-start command to exercise the background job code path
let config_dir = repo.root_path().join(".config");
@@ -2229,7 +2199,7 @@ approved-commands = ["echo 'cleanup test'"]
output.assert_no_directive_leaks();
assert!(
- output.combined.contains("Created worktree"),
+ output.combined.contains("Created new worktree"),
"{}: Should complete successfully",
shell
);
@@ -2254,7 +2224,6 @@ approved-commands = ["echo 'cleanup test'"]
#[test]
fn test_readme_example_hooks_pre_merge() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with pre-merge hooks
let config_dir = repo.root_path().join(".config");
@@ -2525,7 +2494,6 @@ command = "{}"
#[test]
fn test_readme_example_hooks_post_create() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-create and post-start hooks
let config_dir = repo.root_path().join(".config");
@@ -2619,7 +2587,6 @@ fi
use std::io::{Read, Write};
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with named post-create commands
repo.write_project_config(
@@ -2735,7 +2702,6 @@ test = "echo 'Running tests...'"
use std::io::Read;
let repo = TestRepo::new();
- repo.commit("Initial commit");
let wt_bin = get_cargo_bin("wt");
let wt_bin_dir = wt_bin.parent().unwrap();
@@ -2900,7 +2866,6 @@ fi
use std::io::Read;
let repo = TestRepo::new();
- repo.commit("Initial commit");
let wt_bin = get_cargo_bin("wt");
let wt_bin_dir = wt_bin.parent().unwrap();
@@ -3172,7 +3137,6 @@ for c in "${{COMPREPLY[@]}}"; do echo "${{c%% *}}"; done
use std::io::Read;
let repo = TestRepo::new();
- repo.commit("Initial commit");
let wt_bin = get_cargo_bin("wt");
let wt_bin_dir = wt_bin.parent().unwrap();
@@ -3371,7 +3335,6 @@ echo "SCRIPT_COMPLETED"
use std::io::Read;
let repo = TestRepo::new();
- repo.commit("Initial commit");
let wt_bin = get_cargo_bin("wt");
let wt_bin_dir = wt_bin.parent().unwrap();
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index c8afb910c..cfb2f65f3 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -12,5 +12,5 @@ y
🔄 Running project post-create:
  echo 'test command'
test command
-✅ Created worktree test-approve based off main @ [REPO]/repo.test-approve
+✅ Created new worktree for test-approve from main at [REPO]/repo.test-approve
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index f112196df..e85ae71f6 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -10,5 +10,5 @@ n
  echo 'test command'
❓ Allow and remember? [y/N]
⚪ Commands declined, continuing worktree creation
-✅ Created worktree test-decline based off main @ [REPO]/repo.test-decline
+✅ Created new worktree for test-decline from main at [REPO]/repo.test-decline
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index 5330098ff..132c64e82 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -20,5 +20,5 @@ y
🔄 Running project post-create third:
  echo 'Third command'
Third command
-✅ Created worktree test-mixed-accept based off main @ [REPO]/repo.test-mixed-accept
+✅ Created new worktree for test-mixed-accept from main at [REPO]/repo.test-mixed-accept
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index 9af275f68..5c892b033 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -12,5 +12,5 @@ n
  echo 'Third command'
❓ Allow and remember? [y/N]
⚪ Commands declined, continuing worktree creation
-✅ Created worktree test-mixed-decline based off main @ [REPO]/repo.test-mixed-decline
+✅ Created new worktree for test-mixed-decline from main at [REPO]/repo.test-mixed-decline
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index 8d1166bc5..98d454f9c 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -22,5 +22,5 @@ y
🔄 Running project post-create third:
  echo 'Third command'
Third command
-✅ Created worktree test-multi based off main @ [REPO]/repo.test-multi
+✅ Created new worktree for test-multi from main at [REPO]/repo.test-multi
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index b34da60e6..3edb6c96a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -22,5 +22,5 @@ y
🔄 Running project post-create test:
  echo 'Running tests...'
Running tests...
-✅ Created worktree test-named based off main @ [REPO]/repo.test-named
+✅ Created new worktree for test-named from main at [REPO]/repo.test-named
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index f90a05665..e99923648 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -10,9 +10,9 @@ y
  echo 'test command'
❓ Allow and remember? [y/N]
🟡 Failed to save command approval: Failed to write config file: Permission denied (os error 13)
-💡 Approval will be requested again next time
+💡 Approval will be requested again next time.
🔄 Running project post-create:
  echo 'test command'
test command
-✅ Created worktree test-permission based off main @ [REPO]/repo.test-permission
+✅ Created new worktree for test-permission from main at [REPO]/repo.test-permission
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
index 55fd9fb42..945f7a569 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
@@ -4,7 +4,7 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Path Remote⇅ Com│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> @ main ^ . b..│
+> @ main ^ . 2..│
│⚪ main has no uncommitted changes
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap
index e0164c933..6c8bee8d2 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap
@@ -5,12 +5,12 @@ expression: normalized
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> + feature ↑ ↑5 ./repo.feature ..│
- │* b1549b6 1d (feature) Add file 5 with important changes
- │* 111f7e4 1d Add file 4 with important changes
- │* fe8881c 1d Add file 3 with important changes
- │* a0112c1 1d Add file 2 with important changes
- │* f3a13a7 1d Add file 1 with important changes
- │* b834638 1d Initial commit
+ │* d2cf233 1d (feature) Add file 5 with important changes
+ │* 996c924 1d Add file 4 with important changes
+ │* a2eefed 1d Add file 3 with important changes
+ │* 1c1106b 1d Add file 2 with important changes
+ │* 0602185 1d Add file 1 with important changes
+ │* 23e5a15 1d Initial commit
│
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index 5f54a0249..9edd43cb5 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree bash-test based off main @ [TMPDIR]/repo.bash-test
+✅ Created new worktree for bash-test from main at [TMPDIR]/repo.bash-test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index 37349a2e4..7933b3270 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree fish-multiline based off main @ [TMPDIR]/repo.fish-multiline
+✅ Created new worktree for fish-multiline from main at [TMPDIR]/repo.fish-multiline
🔄 Executing (--execute):
  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
index 4983f7434..dcb73b8d5 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree fish-minimal based off main @ [TMPDIR]/repo.fish-minimal
+✅ Created new worktree for fish-minimal from main at [TMPDIR]/repo.fish-minimal
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index 3659fa8d9..aaedd2370 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree fish-bg based off main @ [TMPDIR]/repo.fish-bg
+✅ Created new worktree for fish-bg from main at [TMPDIR]/repo.fish-bg
🔄 Running project post-start:
  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
index 87c41d59d..598c5cecf 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
@@ -7,6 +7,6 @@ expression: output.normalized()
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
-✅ Created worktree feature-x based off main @ [TMPDIR]/repo.feature-x
+✅ Created new worktree for feature-x from main at [TMPDIR]/repo.feature-x
🔄 Running project post-start dev:
  uv run dev
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
index a4ea45be9..1dd78f22e 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree fix-auth based off main @ [TMPDIR]/repo.fix-auth
+✅ Created new worktree for fix-auth from main at [TMPDIR]/repo.fix-auth
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap
index 5630e1750..a00343b8a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Switched to feature-api @ [TMPDIR]/repo.feature-api
+✅ Switched to worktree for feature-api at [TMPDIR]/repo.feature-api
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
index 6ae8d62e3..49a0583f6 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree feature based off main @ [TMPDIR]/repo.feature
+✅ Created new worktree for feature from main at [TMPDIR]/repo.feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index 9e68d4fbe..f6b59740d 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree test-exec based off main @ [TMPDIR]/repo.test-exec
+✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
🔄 Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index 9e68d4fbe..f6b59740d 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree test-exec based off main @ [TMPDIR]/repo.test-exec
+✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
🔄 Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index e06137389..1ba35ba38 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -8,7 +8,7 @@ Installing dependencies...
🔄 Running project post-create build:
  echo 'Building project...'
Building project...
-✅ Created worktree feature-hooks based off main @ [TMPDIR]/repo.feature-hooks
+✅ Created new worktree for feature-hooks from main at [TMPDIR]/repo.feature-hooks
🔄 Running project post-start server:
  echo 'Starting dev server on port 3000'
🔄 Running project post-start watch:
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index f72bc5b0e..c259856b2 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree feature-with-hooks based off main @ [TMPDIR]/repo.feature-with-hooks
+✅ Created new worktree for feature-with-hooks from main at [TMPDIR]/repo.feature-with-hooks
🔄 Running project post-start:
  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 5311c7637..f11476a3a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created worktree feature-bg based off main @ [TMPDIR]/repo.feature-bg
+✅ Created new worktree for feature-bg from main at [TMPDIR]/repo.feature-bg
🔄 Running project post-start:
  echo 'background task'
diff --git a/tests/integration_tests/spacing_edge_cases.rs b/tests/integration_tests/spacing_edge_cases.rs
index c6fc210dd..20b0ca680 100644
--- a/tests/integration_tests/spacing_edge_cases.rs
+++ b/tests/integration_tests/spacing_edge_cases.rs
@@ -28,7 +28,6 @@ fn run_snapshot(settings: Settings, test_name: &str, mut cmd: Command) {
#[test]
fn test_short_branch_names_shorter_than_header() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktrees with very short branch names (shorter than "Branch" header)
repo.add_worktree("a");
@@ -41,7 +40,6 @@ fn test_short_branch_names_shorter_than_header() {
#[test]
fn test_long_branch_names_longer_than_header() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktrees with very long branch names
repo.add_worktree("very-long-feature-branch-name");
@@ -54,7 +52,6 @@ fn test_long_branch_names_longer_than_header() {
#[test]
fn test_unicode_branch_names_width_calculation() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktrees with unicode characters that have different visual widths
// Note: Git may have restrictions on branch names, so use valid characters
@@ -68,7 +65,6 @@ fn test_unicode_branch_names_width_calculation() {
#[test]
fn test_mixed_length_branch_names() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Mix of very short, medium, and very long branch names
repo.add_worktree("x");
@@ -84,7 +80,6 @@ fn test_mixed_length_branch_names() {
#[test]
fn test_column_alignment_varying_diff_widths() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktrees with varying diff sizes to test alignment
repo.add_worktree("feature-small");
@@ -114,7 +109,6 @@ fn test_column_alignment_varying_diff_widths() {
#[test]
fn test_column_alignment_with_empty_diffs() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Mix of worktrees with and without diffs
repo.add_worktree("no-changes");
@@ -132,7 +126,6 @@ fn test_column_alignment_with_empty_diffs() {
#[test]
fn test_column_alignment_extreme_diff_sizes() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create worktrees with extreme diff size differences
repo.add_worktree("tiny");
diff --git a/tests/integration_tests/statusline.rs b/tests/integration_tests/statusline.rs
index f40d1eae1..d24e4d87d 100644
--- a/tests/integration_tests/statusline.rs
+++ b/tests/integration_tests/statusline.rs
@@ -59,14 +59,11 @@ fn run_statusline(repo: &TestRepo, args: &[&str], stdin_json: Option<&str>) -> S
// --- Test Fixtures ---
fn setup_basic_repo() -> TestRepo {
- let repo = TestRepo::new();
- repo.commit("Initial commit");
- repo
+ TestRepo::new()
}
fn setup_repo_with_changes() -> TestRepo {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create uncommitted changes
std::fs::write(repo.root_path().join("modified.txt"), "modified content").unwrap();
@@ -76,7 +73,6 @@ fn setup_repo_with_changes() -> TestRepo {
fn setup_repo_with_commits_ahead() -> TestRepo {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature branch with commits ahead
let feature_path = repo.add_worktree("feature");
diff --git a/tests/integration_tests/switch.rs b/tests/integration_tests/switch.rs
index ab0919fbe..ca13a704f 100644
--- a/tests/integration_tests/switch.rs
+++ b/tests/integration_tests/switch.rs
@@ -5,9 +5,7 @@ use tempfile::TempDir;
/// Common setup for switch tests - creates repo with initial commit
fn setup_switch_repo() -> TestRepo {
- let repo = TestRepo::new();
- repo.commit("Initial commit");
- repo
+ TestRepo::new()
}
/// Helper to create snapshot with normalized paths and SHAs
diff --git a/tests/integration_tests/user_hooks.rs b/tests/integration_tests/user_hooks.rs
index 4346592e7..e204f84c8 100644
--- a/tests/integration_tests/user_hooks.rs
+++ b/tests/integration_tests/user_hooks.rs
@@ -36,7 +36,6 @@ fn snapshot_switch(test_name: &str, repo: &TestRepo, args: &[&str]) {
#[test]
fn test_user_post_create_hook_executes() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Write user config with post-create hook (no project config)
repo.write_test_config(
@@ -69,7 +68,6 @@ log = "echo 'USER_POST_CREATE_RAN' > user_hook_marker.txt"
#[test]
fn test_user_hooks_run_before_project_hooks() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-create hook
repo.write_project_config(r#"post-create = "echo 'PROJECT_HOOK' >> hook_order.txt""#);
@@ -107,7 +105,6 @@ approved-commands = ["echo 'PROJECT_HOOK' >> hook_order.txt"]
#[test]
fn test_user_hooks_no_approval_required() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Write user config with hook but NO pre-approved commands
// (unlike project hooks, user hooks don't require approval)
@@ -133,7 +130,6 @@ setup = "echo 'NO_APPROVAL_NEEDED' > no_approval.txt"
#[test]
fn test_no_verify_flag_skips_all_hooks() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-create hook
repo.write_project_config(r#"post-create = "echo 'PROJECT_HOOK' > project_marker.txt""#);
@@ -180,7 +176,6 @@ approved-commands = ["echo 'PROJECT_HOOK' > project_marker.txt"]
#[test]
fn test_user_post_create_hook_failure() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Write user config with failing hook
repo.write_test_config(
@@ -211,7 +206,6 @@ failing = "exit 1"
#[test]
fn test_user_post_start_hook_executes() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Write user config with post-start hook (background)
repo.write_test_config(
@@ -239,7 +233,6 @@ bg = "echo 'USER_POST_START_RAN' > user_bg_marker.txt"
#[test]
fn test_user_post_start_skipped_with_no_verify() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Write user config with post-start hook
repo.write_test_config(
@@ -285,7 +278,6 @@ fn snapshot_merge(test_name: &str, repo: &TestRepo, args: &[&str], cwd: Option<&
#[test]
fn test_user_pre_merge_hook_executes() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature worktree with a commit
let feature_wt = repo.add_worktree("feature");
@@ -331,7 +323,6 @@ check = "echo 'USER_PRE_MERGE_RAN' > user_premerge.txt"
#[test]
fn test_user_pre_merge_hook_failure_blocks_merge() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature worktree with a commit
let feature_wt = repo.add_worktree("feature");
@@ -372,7 +363,6 @@ check = "exit 1"
#[test]
fn test_user_pre_merge_skipped_with_no_verify() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature worktree with a commit
let feature_wt = repo.add_worktree("feature");
@@ -483,7 +473,6 @@ long = "sh -c 'echo start >> hook.log; sleep 30; echo done >> hook.log'"
#[test]
fn test_user_post_merge_hook_executes() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature worktree with a commit
let feature_wt = repo.add_worktree("feature");
@@ -546,7 +535,6 @@ fn snapshot_remove(test_name: &str, repo: &TestRepo, args: &[&str], cwd: Option<
#[cfg_attr(windows, ignore)]
fn test_user_pre_remove_hook_executes() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree to remove
let _feature_wt = repo.add_worktree("feature");
@@ -579,7 +567,6 @@ cleanup = "echo 'USER_PRE_REMOVE_RAN' > /tmp/user_preremove_marker.txt"
#[test]
fn test_user_pre_remove_failure_blocks_removal() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree to remove
let feature_wt = repo.add_worktree("feature");
@@ -612,7 +599,6 @@ block = "exit 1"
#[test]
fn test_user_pre_remove_skipped_with_no_verify() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create a worktree to remove
let feature_wt = repo.add_worktree("feature");
@@ -657,7 +643,6 @@ block = "exit 1"
#[test]
fn test_user_pre_commit_hook_executes() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature worktree
let feature_wt = repo.add_worktree("feature");
@@ -691,7 +676,6 @@ lint = "echo 'USER_PRE_COMMIT_RAN' > user_precommit.txt"
#[test]
fn test_user_pre_commit_failure_blocks_commit() {
let mut repo = TestRepo::new();
- repo.commit("Initial commit");
// Create feature worktree
let feature_wt = repo.add_worktree("feature");
@@ -726,7 +710,6 @@ lint = "exit 1"
#[test]
fn test_user_hook_template_variables() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Write user config with hook using template variables
repo.write_test_config(
@@ -766,7 +749,6 @@ vars = "echo 'repo={{ repo }} branch={{ branch }}' > template_vars.txt"
#[test]
fn test_user_and_project_post_start_both_run() {
let repo = TestRepo::new();
- repo.commit("Initial commit");
// Create project config with post-start hook
repo.write_project_config(r#"post-start = "echo 'PROJECT_POST_START' > project_bg.txt""#);
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index 5b03153a1..7435af477 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'approved' > output.txt
-✅ Created worktree test-approved based off main @ [REPO].test-approved
+✅ Created new worktree for test-approved from main at [REPO].test-approved
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
index 3bdc78e19..2910f661c 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
@@ -28,5 +28,5 @@ exit_code: 0
🔄 Running project post-create:
  echo 'test command'
test command
-✅ Created worktree test-force-tty based off main @ [REPO].test-force-tty
+✅ Created new worktree for test-force-tty from main at [REPO].test-force-tty
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
index 9164ac179..9520a818a 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
@@ -27,5 +27,5 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'test command' > output.txt
-✅ Created worktree test-force based off main @ [REPO].test-force
+✅ Created new worktree for test-force from main at [REPO].test-force
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
index 4ef43508d..5ccb9d88a 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
@@ -25,4 +25,4 @@ exit_code: 0
@ main ^ ./repo.main 6c3da842 1d Initial commit on main
+ feature ⚑↑ ↑1 ./repo.feature 72413a3b 1d Work on feature
-⚪ Showing 2 worktrees; 1 ahead
+⚪ Showing 2 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
index 0a3f2d90b..0fb1a6ee7 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap
@@ -45,8 +45,8 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
⚪ Running diagnostic checks...
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
index 334a1904d..6b5c5f838 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap
@@ -41,8 +41,8 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
⚪ Running diagnostic checks...
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
index 2b6c99617..871f55138 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap
@@ -40,5 +40,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
index bdedf6725..2c492946c 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap
@@ -33,5 +33,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
index 951962fa8..84c32e4aa 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
@@ -40,8 +40,8 @@ exit_code: 0
⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
⚪ Skipped fish; ~/.config/fish/conf.d not found
-💡 Run wt config shell install to enable shell integration
+💡 wt config shell install enables shell integration
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
index fdb3e4c52..caa512b73 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap
@@ -42,5 +42,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
index ff66e5665..fd5baff49 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap
@@ -44,5 +44,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
index b199e1982..ac46f200d 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap
@@ -46,5 +46,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
index ab7f50b4a..61dcf0c4d 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
@@ -41,5 +41,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
index c1c936bd2..d0da06b9e 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
@@ -43,5 +43,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index a163de7f7..d1488dc9a 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
index 55124bd25..d0392fde1 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
@@ -25,8 +25,8 @@ exit_code: 0
Set-Location '[PATH]'
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ a3899aa (no commit/squash/rebase needed)
+  * a3899aa Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 5e792af90..8e8b55827 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
@@ -25,8 +25,8 @@ exit_code: 0
cd '[PATH]'
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap
index 94a14a565..bbf9d9380 100644
--- a/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap
+++ b/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap
@@ -25,4 +25,4 @@ exit_code: 0
Set-Location '[PATH]'
----- stderr -----
-✅ Switched to feature @ [REPO].feature
+✅ Switched to worktree for feature at [REPO].feature
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap
index 83f3e8171..6ee9473e0 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap
@@ -28,5 +28,6 @@ exit_code: 0
----- stderr -----
🔄 Running in main...
+warning: untracked cache is disabled on this system or location
✅ Completed in 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap
index a6a5070ee..e48369e18 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap
@@ -28,6 +28,7 @@ exit_code: 0
----- stderr -----
🔄 Running in main...
+warning: untracked cache is disabled on this system or location
🔄 Running in (detached)...
✅ Completed in 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
index 73bdb2d10..21e7081c8 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
@@ -41,5 +41,5 @@ exit_code: 0
⚪ Skipped fish; ~/.config/fish/conf.d not found
BINARIES
-🟡 gh installed but not authenticated; run gh auth login
-🟡 glab installed but not authenticated; run glab auth login
+🟡 gh installed but not authenticated; run gh auth login
+🟡 glab installed but not authenticated; run glab auth login
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
index d84e0c80a..7d18aed71 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index 5c615771b..953ab9845 100644
--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
- branch-only /_ b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
+ branch-only /_ 23e5a150 1d Initial commit
-⚪ Showing 1 worktree, 1 branch
+⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
index 7ff9e629e..182782cc5 100644
--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
@@ -23,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ⚑^ . b834638e 1d Initial commit
+@ develop ⚑^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index d9b983cf3..08611ae05 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -23,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ⚑^ . b834638e 1d Initial commit
+@ - ⚑^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
index 274e00998..392272f7e 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ - ⚑_ ./repo.feature b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ - ⚑_ ./repo.feature 23e5a150 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
index 1c82ed78a..f437a07a3 100644
--- a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
@@ -27,8 +27,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "133d1f05a73a1478707f3438625069c7ebd8eb27",
- "short_sha": "133d1f0",
+ "sha": "ede2fd3bb9c1e19c7b803c11c0648d0b6d335ea2",
+ "short_sha": "ede2fd3",
"message": "Same content on main",
"timestamp": 0
},
@@ -62,8 +62,8 @@ exit_code: 0
"path": "[REPO].feature-merged",
"kind": "worktree",
"commit": {
- "sha": "d78d130165cc11f6df39113ded5bbf1c16f8ebc3",
- "short_sha": "d78d130",
+ "sha": "034aef5b37347d10e770bb86865c148124ff8546",
+ "short_sha": "034aef5",
"message": "Merge main into feature",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
index e55ebb1ee..a3e5cd189 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
@@ -27,8 +27,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "a27cd57d20a6211799da676e70edefa5152f99fe",
- "short_sha": "a27cd57",
+ "sha": "2c97a38e97cba7ea1d95d6c8b948b0cf5199fc79",
+ "short_sha": "2c97a38",
"message": "Main commit 2",
"timestamp": 0
},
@@ -62,8 +62,8 @@ exit_code: 0
"path": "[REPO].feature-ahead",
"kind": "worktree",
"commit": {
- "sha": "f16cd37915d5ee93903252f5cf877c76c54f3d50",
- "short_sha": "f16cd37",
+ "sha": "13797c6a6136f965d1186fdb1f4fa2de2707df6d",
+ "short_sha": "13797c6",
"message": "Feature commit 2",
"timestamp": 0
},
@@ -96,8 +96,8 @@ exit_code: 0
"path": "[REPO].feature-behind",
"kind": "worktree",
"commit": {
- "sha": "6c3da84215d400bf6e05a7f9cd1efcfbd825b9e9",
- "short_sha": "6c3da84",
+ "sha": "98ef56c1ce6de2d5c942729c2be35461c4441a8a",
+ "short_sha": "98ef56c",
"message": "Initial commit on main",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
index 27105b6c3..fca5e1dbd 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
@@ -27,8 +27,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "f4fa1ba1ca52a38a0036c3c9dd8b486a83ced1e5",
- "short_sha": "f4fa1ba",
+ "sha": "3109da74e45839c90409a6e4774cdf0bae50a284",
+ "short_sha": "3109da7",
"message": "Main conflicting changes",
"timestamp": 0
},
@@ -62,8 +62,8 @@ exit_code: 0
"path": "[REPO].feature",
"kind": "worktree",
"commit": {
- "sha": "f4fa1ba1ca52a38a0036c3c9dd8b486a83ced1e5",
- "short_sha": "f4fa1ba",
+ "sha": "3109da74e45839c90409a6e4774cdf0bae50a284",
+ "short_sha": "3109da7",
"message": "Main conflicting changes",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index e2161feae..605e996d4 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -27,8 +27,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
- "short_sha": "b834638",
+ "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",
+ "short_sha": "23e5a15",
"message": "Initial commit",
"timestamp": 0
},
@@ -62,8 +62,8 @@ exit_code: 0
"path": "[REPO].feature-detached",
"kind": "worktree",
"commit": {
- "sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
- "short_sha": "b834638",
+ "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",
+ "short_sha": "23e5a15",
"message": "Initial commit",
"timestamp": 0
},
@@ -100,8 +100,8 @@ exit_code: 0
"path": "[REPO].locked-feature",
"kind": "worktree",
"commit": {
- "sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
- "short_sha": "b834638",
+ "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",
+ "short_sha": "23e5a15",
"message": "Initial commit",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
index 3cce17422..0ad2fd53c 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
@@ -27,8 +27,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
- "short_sha": "b834638",
+ "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",
+ "short_sha": "002eabd",
"message": "Initial commit",
"timestamp": 0
},
@@ -62,8 +62,8 @@ exit_code: 0
"path": "[REPO].with-status",
"kind": "worktree",
"commit": {
- "sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
- "short_sha": "b834638",
+ "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",
+ "short_sha": "002eabd",
"message": "Initial commit",
"timestamp": 0
},
@@ -100,8 +100,8 @@ exit_code: 0
"path": "[REPO].without-status",
"kind": "worktree",
"commit": {
- "sha": "b834638e33dbc6b37002685ee0777f4b8f1af904",
- "short_sha": "b834638",
+ "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",
+ "short_sha": "002eabd",
"message": "Initial commit",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index 1b4200de1..db096e556 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 1d Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 1d Add 100 lines
-+ fix ? _ 💬 ./repo.fix b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged b5af29ef 1d Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes c22cc0ea 1d Add 100 lines
++ fix ? _ 💬 ./repo.fix 23e5a150 1d Initial commit
-⚪ Showing 4 worktrees; 2 with changes, 2 ahead
+⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 9a0d22bd3..46a695800 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
-^ main ^ ./repo 6c3da842 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
+@ feature-current ↑ ↑1 ./repo.feature-current 0a3c2673 23h Commit at 01:00
+^ main ^ ./repo 98ef56c1 1d Initial commit on main
++ feature-newest ↑ ↑1 ./repo.feature-newest fecd7fba 21h Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle b3bdc202 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 4e1d6a2d 23h Commit at 00:30
-⚪ Showing 5 worktrees; 4 ahead
+⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
index 7e96f9d17..60624189c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ⚑^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ develop ⚑^ ./repo 23e5a150 1d Initial commit
++ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
++ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index 2d93dbb1a..e3ab2ad0c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
@@ -19,8 +19,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
++ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index 94969c860..cb9d3efb4 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ locked-no-reason ⊞_ ./repo.locked-no-reason b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ locked-no-reason ⊞_ ./repo.locked-no-reason 23e5a150 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index 3227102ce..799565930 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ locked-feature ⊞_ ./repo.locked-feature b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ locked-feature ⊞_ ./repo.locked-feature 23e5a150 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index 401a08c2e..a9c978c71 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 1310bfb9 1d Short message
-+ feature-a ⊂ ↓1 ./repo.feature-a f078644e 1d This is a very long commit message that should test how the…
+@ main ^ ./repo e255c04f 1d Short message
++ feature-a ⊂ ↓1 ./repo.feature-a 706db1c1 1d This is a very long commit message that should test how the…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
index 80150524e..1ab8f6dd0 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ medium-name _ ./repo.medium-name b834638e 1d Initial commit
-+ short _ ./repo.short b834638e 1d Initial commit
-+ very-long-branch-name-here _ ./repo.very-long-branch-name-here b834638e 1d Initial commit
-+ with-changes _ ./repo.with-changes b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ medium-name _ ./repo.medium-name 23e5a150 1d Initial commit
++ short _ ./repo.short 23e5a150 1d Initial commit
++ very-long-branch-name-here _ ./repo.very-long-branch-name-here 23e5a150 1d Initial commit
++ with-changes _ ./repo.with-changes 23e5a150 1d Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 08a8e48b9..d972eb6c8 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./repo ⇡1 85ed6d3d 1d Main advances
-+ feature +!?⊞✗⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
+@ main ^⇡ ./repo ⇡1 7bfbaf47 1d Main advances
++ feature +!?⊞✗⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 63aaaeb2 1d Local commit
-⚪ Showing 2 worktrees; 1 with changes, 1 ahead
+⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index 933591335..d679c386d 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo b7c14ce1 1d Main conflicting changes
-+ feature +!?✘ 🤖 +7 ./repo.feature b7c14ce1 1d Main conflicting changes
+@ main ^ ./repo 966ac172 1d Main conflicting changes
++ feature +!?✘ 🤖 +7 ./repo.feature 966ac172 1d Main conflicting changes
-⚪ Showing 2 worktrees; 1 with changes
+⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index 044883804..50184e079 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature +!? ↑ +2 -3 ↑1 ./repo.feature 689c2504 1d Add files
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature +!? ↑ +2 -3 ↑1 ./repo.feature beeae57b 1d Add files
-⚪ Showing 2 worktrees; 1 with changes, 1 ahead
+⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 30837abd3..e5f2d90b5 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
++ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
index b099ac998..de1949f9f 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature _ ./repo.feature b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature _ ./repo.feature 23e5a150 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
index eacbfbb5e..b674e7a59 100644
--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-- feature _ ./repo.feature b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
+- feature _ ./repo.feature 23e5a150 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
index c9d125eee..ca9182abd 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
++ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index bdbc27cf5..85a530581 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
- orphan-1 /_ b834638e 1d Initial commit
- orphan-2 /_ b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
+ orphan-1 /_ 23e5a150 1d Initial commit
+ orphan-2 /_ 23e5a150 1d Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
index af247fd9a..d5db0e947 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 28d38c20 30m Add API tests
-^ main ^⇅ ./repo ⇡1 ⇣1 2e6b7a8f 4d Merge fix-auth:…
-+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 1d697d5b 5h Add secure token…
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 d35485d7 30m Add API tests
+^ main ^⇅ ./repo ⇡1 ⇣1 e18e1b4d 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 2517d700 5h Add secure token…
-⚪ Showing 3 worktrees; 1 with changes, 2 ahead
+⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index 71c991e29..bf8af55c0 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
@@ -25,10 +25,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
-^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
-+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
- exp /↕ ↑2 ↓1 +137 32936618 2d
- wip /↕ ↑1 ↓1 +33 6844b101 3d
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● d35485d7 30m
+^ main ^⇅ ./repo ⇡1 ⇣1 ● e18e1b4d 4d
++ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 2517d700 5h
+ exp /↕ ↑2 ↓1 +137 52cad122 2d
+ wip /↕ ↑1 ↓1 +33 7ca6d817 3d
-⚪ Showing 3 worktrees, 2 branches; 1 with changes, 4 ahead; 1 column hidden
+⚪ Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
index bd2ab3f95..76f94b130 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
-^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
-+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● d35485d7 30m
+^ main ^⇅ ./repo ⇡1 ⇣1 ● e18e1b4d 4d
++ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 2517d700 5h
-⚪ Showing 3 worktrees; 1 with changes, 2 ahead; 1 column hidden
+⚪ Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index dad874d2c..e36bb8a39 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -23,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index 4005bb43d..50d29e5b6 100644
--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 579fcd0b 1d Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./repo.pr-link e17e7d2d 1d PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence a2483ffd 1d Initial content
+@ main ^ ./repo 23e5a150 1d Initial commit
++ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 8640e085 1d Symbol commit
++ pr-link ↑ 🤖 ↑1 ./repo.pr-link e276c9d3 1d PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence 9bb9b94c 1d Initial content
-⚪ Showing 4 worktrees; 1 with changes, 3 ahead
+⚪ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
index 0c9329297..06a70c5f3 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ⚑^ . b834638e 1d Initial commit
+@ - ⚑^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
index 6ae297b1b..aeb11d8e9 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a ? _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 1d Test commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-a ? _ ./repo.feature-a 23e5a150 1d Initial commit
++ feature-b ↑ ↑1 +1 -1 ./repo.feature-b a1aff845 1d Test commit
-⚪ Showing 3 worktrees; 1 ahead
+⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
index be1c3f34a..efc4a669f 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
@@ -24,16 +24,16 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-1 _ ./repo.feature-1 b834638e 1d Initial commit
-+ feature-10 _ ./repo.feature-10 b834638e 1d Initial commit
-+ feature-2 _ ./repo.feature-2 b834638e 1d Initial commit
-+ feature-3 _ ./repo.feature-3 b834638e 1d Initial commit
-+ feature-4 _ ./repo.feature-4 b834638e 1d Initial commit
-+ feature-5 _ ./repo.feature-5 b834638e 1d Initial commit
-+ feature-6 _ ./repo.feature-6 b834638e 1d Initial commit
-+ feature-7 _ ./repo.feature-7 b834638e 1d Initial commit
-+ feature-8 _ ./repo.feature-8 b834638e 1d Initial commit
-+ feature-9 _ ./repo.feature-9 b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-1 _ ./repo.feature-1 23e5a150 1d Initial commit
++ feature-10 _ ./repo.feature-10 23e5a150 1d Initial commit
++ feature-2 _ ./repo.feature-2 23e5a150 1d Initial commit
++ feature-3 _ ./repo.feature-3 23e5a150 1d Initial commit
++ feature-4 _ ./repo.feature-4 23e5a150 1d Initial commit
++ feature-5 _ ./repo.feature-5 23e5a150 1d Initial commit
++ feature-6 _ ./repo.feature-6 23e5a150 1d Initial commit
++ feature-7 _ ./repo.feature-7 23e5a150 1d Initial commit
++ feature-8 _ ./repo.feature-8 23e5a150 1d Initial commit
++ feature-9 _ ./repo.feature-9 23e5a150 1d Initial commit
⚪ Showing 11 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
index 3739e1e01..86dfa7cc4 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
-+ feature-c _ ./repo.feature-c b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
++ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
++ feature-c _ ./repo.feature-c 23e5a150 1d Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index f8100766f..aad852715 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
-^ main ^ ./repo 6c3da842 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
+@ feature-current ↑ ↑1 ./repo.feature-current 0a3c2673 23h Commit at 01:00
+^ main ^ ./repo 98ef56c1 1d Initial commit on main
++ feature-newest ↑ ↑1 ./repo.feature-newest fecd7fba 21h Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle b3bdc202 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 4e1d6a2d 23h Commit at 00:30
-⚪ Showing 5 worktrees; 4 ahead
+⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
index 9851bf25a..1c56736aa 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
index 6f51bf4d8..438f649f9 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ locked ⊞_ ./repo.locked b834638e 1d Initial commit
-+ normal _ ./repo.normal b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ locked ⊞_ ./repo.locked 23e5a150 1d Initial commit
++ normal _ ./repo.normal 23e5a150 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index 945097b04..45d350883 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^| ./repo | 6c3da842 1d Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 2fff52c2 1d Ahead commit
-+ in-sync _| ./repo.in-sync | 6c3da842 1d Initial commit on main
+@ main ^| ./repo | 98ef56c1 1d Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 52e3cac0 1d Ahead commit
++ in-sync _| ./repo.in-sync | 98ef56c1 1d Initial commit on main
-⚪ Showing 3 worktrees; 1 ahead
+⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index 5ccd4941c..ebc4e6560 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo e4614cb7 1d Fix bug with café ☕ handling
-+ feature-test ⊂ ↓1 ./repo.feature-test 0c53695b 1d Add support for 日本語 and émoji 🎉
+@ main ^ ./repo 6129b674 1d Fix bug with café ☕ handling
++ feature-test ⊂ ↓1 ./repo.feature-test 18096b4b 1d Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
index 379078da1..26fe270a4 100644
--- a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ emoji _ 🔄 ./repo.emoji b834638e 1d Initial commit
-+ multi _ 👨‍💻 ./repo.multi b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ emoji _ 🔄 ./repo.emoji 23e5a150 1d Initial commit
++ multi _ 👨‍💻 ./repo.multi 23e5a150 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index 43a991f9b..4e0aca8a1 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- another-branch /_ b834638e 1d Initial commit
- feature-without-worktree /_ b834638e 1d Initial commit
- fix-bug /_ b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree 23e5a150 1d Initial commit
+ another-branch /_ 23e5a150 1d Initial commit
+ feature-without-worktree /_ 23e5a150 1d Initial commit
+ fix-bug /_ 23e5a150 1d Initial commit
⚪ Showing 2 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
index 0eb3788c8..325c54884 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
++ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
index b5e2e0425..d7cd9fcbe 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
- branch-alpha /_ b834638e 1d Initial commit
- branch-beta /_ b834638e 1d Initial commit
- branch-gamma /_ b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
+ branch-alpha /_ 23e5a150 1d Initial commit
+ branch-beta /_ 23e5a150 1d Initial commit
+ branch-gamma /_ 23e5a150 1d Initial commit
-⚪ Showing 1 worktree, 3 branches
+⚪ Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index 02718a1ad..2181bbecb 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -25,10 +25,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| . | b834638e 1d Initial commit
- local-only-1 /_ b834638e 1d Initial commit
- local-only-2 /_ b834638e 1d Initial commit
- origin/remote-only-1 /_ b834638e 1d Initial commit
- origin/remote-only-2 /_ b834638e 1d Initial commit
+@ main ^| . | 23e5a150 1d Initial commit
+ local-only-1 /_ 23e5a150 1d Initial commit
+ local-only-2 /_ 23e5a150 1d Initial commit
+ origin/remote-only-1 /_ 23e5a150 1d Initial commit
+ origin/remote-only-2 /_ 23e5a150 1d Initial commit
-⚪ Showing 1 worktree, 2 branches, 2 remote branches
+⚪ Showing 1 worktrees, 2 branches, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index 44f2ab6e7..d06c551a9 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| ./repo | b834638e 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- origin/remote-only /_ b834638e 1d Initial commit
+@ main ^| ./repo | 23e5a150 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree 23e5a150 1d Initial commit
+ origin/remote-only /_ 23e5a150 1d Initial commit
-⚪ Showing 2 worktrees, 1 remote branch
+⚪ Showing 2 worktrees, 1 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index 0af7d63d4..05cc96876 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| . | b834638e 1d Initial commit
- origin/remote-feature-1 /_ b834638e 1d Initial commit
- origin/remote-feature-2 /_ b834638e 1d Initial commit
+@ main ^| . | 23e5a150 1d Initial commit
+ origin/remote-feature-1 /_ 23e5a150 1d Initial commit
+ origin/remote-feature-2 /_ 23e5a150 1d Initial commit
-⚪ Showing 1 worktree, 2 remote branches
+⚪ Showing 1 worktrees, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 5b018cb34..2f6a5d08a 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -26,11 +26,11 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^| ./repo | 6c3da842 1d Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 8d8f4673 1d Ahead commit 2
-+ behind _⇣ ./repo.behind ⇣1 6c3da842 1d Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 ca7cb696 1d Diverged local commit
-+ in-sync _| ./repo.in-sync | 6c3da842 1d Initial commit on main
-+ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
+@ main ^| ./repo | 98ef56c1 1d Initial commit on main
++ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 a7df60e1 1d Ahead commit 2
++ behind _⇣ ./repo.behind ⇣1 98ef56c1 1d Initial commit on main
++ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 26606aa3 1d Diverged local commit
++ in-sync _| ./repo.in-sync | 98ef56c1 1d Initial commit on main
++ no-upstream _ ./repo.no-upstream 98ef56c1 1d Initial commit on main
-⚪ Showing 6 worktrees; 2 ahead
+⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
index 4bea5777c..9cce272e7 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-api ↑ 🤖 ↑1 ./repo.feature-api 9606cd0f 1d Add REST API endpoints
-+ review-ui ? ↑ 💬 ↑1 ./repo.review-ui afd3b353 1d Add dashboard component
-+ wip-docs ? _ ./repo.wip-docs b834638e 1d Initial commit
+@ main ^ ./repo 002eabd0 1d Initial commit
++ feature-api ↑ 🤖 ↑1 ./repo.feature-api 2f045483 1d Add REST API endpoints
++ review-ui ? ↑ 💬 ↑1 ./repo.review-ui b8c11f99 1d Add dashboard component
++ wip-docs ? _ ./repo.wip-docs 002eabd0 1d Initial commit
-⚪ Showing 4 worktrees; 2 ahead
+⚪ Showing 4 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
index 77ecbf746..74b8689e3 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ test +!? +1 -1 ./repo.test b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ test +!? +1 -1 ./repo.test 23e5a150 1d Initial commit
-⚪ Showing 2 worktrees; 1 with changes
+⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
index c6f88038c..8967093d8 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ complex !? +1 -1 ./repo.complex b834638e 1d Initial commit
-+ simple + ? +1 -1 ./repo.simple b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ complex !? +1 -1 ./repo.complex 23e5a150 1d Initial commit
++ simple + ? +1 -1 ./repo.simple 23e5a150 1d Initial commit
-⚪ Showing 3 worktrees; 2 with changes
+⚪ Showing 3 worktrees, 2 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
index 55c871a98..639e45e5a 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -26,6 +27,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
index 52bcc0620..cc8ac121c 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
@@ -28,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
- feature /_ b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
+ feature /_ 23e5a150 1d Initial commit
-⚪ Showing 1 worktree, 1 branch
+⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
index 55c871a98..639e45e5a 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -26,6 +27,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
index 55c871a98..639e45e5a 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -26,6 +27,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
index 55c871a98..639e45e5a 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -26,6 +27,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index 5e3609c3c..32fe40095 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
@@ -24,12 +24,12 @@ exit_code: 0
----- stderr -----
🔄 Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-💡 Backup created @ 330ccd6
+💡 Backup created @ e997a6b
🔄 Generating squash commit message...
  fix: update file 1 content
-✅ Squashed @ b54183b
-🔄 Merging 1 commit to main @ b54183b (no rebase needed)
-  * b54183b fix: update file 1 content
+✅ Squashed @ 735173c
+🔄 Merging 1 commit to main @ 735173c (no rebase needed)
+  * 735173c fix: update file 1 content
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 94231bbaf..29f6d34d3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -24,16 +24,16 @@ exit_code: 0
----- stderr -----
🔄 Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-💡 Backup created @ b18c23e
+💡 Backup created @ 0b230e0
🔄 Generating squash commit message...
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: initial feature
-✅ Squashed @ d118927
-🔄 Merging 1 commit to main @ d118927 (no rebase needed)
-  * d118927 Squash commits from main
+✅ Squashed @ 760ba6d
+🔄 Merging 1 commit to main @ 760ba6d (no rebase needed)
+  * 760ba6d Squash commits from main
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index cc75d4126..3584c4622 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
@@ -24,12 +24,12 @@ exit_code: 0
----- stderr -----
🔄 Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-💡 Backup created @ 967330a
+💡 Backup created @ 174c6c4
🔄 Generating squash commit message...
  fix: improve auth validation logic
-✅ Squashed @ 1e3993e
-🔄 Merging 1 commit to main @ 1e3993e (no rebase needed)
-  * 1e3993e fix: improve auth validation logic
+✅ Squashed @ 0b55555
+🔄 Merging 1 commit to main @ 0b55555 (no rebase needed)
+  * 0b55555 fix: improve auth validation logic
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index 67c934ea9..dca532455 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -28,9 +28,9 @@ exit_code: 0
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to dirty.txt
-✅ Committed changes @ c1126ec
-🔄 Merging 1 commit to main @ c1126ec (no rebase needed)
-  * c1126ec Changes to dirty.txt
+✅ Committed changes @ a73fb89
+🔄 Merging 1 commit to main @ a73fb89 (no rebase needed)
+  * a73fb89 Changes to dirty.txt
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 700e30884..a855e45c5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
index efcd1c153..551671133 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
@@ -26,6 +26,6 @@ exit_code: 1
----- stderr -----
❌ Can't push to local main branch: it has newer commits
-  * fb975b3 Add main file
+  * fd8f601 Add main file
💡 Run wt merge again to incorporate these changes
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index e1dc4b175..adad00483 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -28,9 +28,9 @@ exit_code: 0
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to newfile.txt
-✅ Committed changes @ 96ddfbc
-🔄 Merging 1 commit to main @ 96ddfbc (no rebase needed)
-  * 96ddfbc Changes to newfile.txt
+✅ Committed changes @ 4b94530
+🔄 Merging 1 commit to main @ 4b94530 (no rebase needed)
+  * 4b94530 Changes to newfile.txt
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index ef64f7e1c..924b8279c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index 1ea907013..bb8c67a20 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
-  * bf212d3 feat: add file 2
-  * 123e46c feat: add file 1
+🔄 Merging 2 commits to main @ 1c5f30c (no commit/squash/rebase needed)
+  * 1c5f30c feat: add file 2
+  * b795264 feat: add file 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 2b2539a08..12da59f74 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
-  * 4af48f0 Add feature file
+🔄 Merging 1 commit to main @ 83771b6 (no commit/squash/rebase needed)
+  * 83771b6 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index af850237e..a443848c5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -24,8 +24,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
-  * cdb002e Add feature file
+🔄 Merging 1 commit to main @ b979f04 (no commit/squash/rebase needed)
+  * b979f04 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index ba65460b2..7787a0efb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
-  * 8609b84 Add feature file
+🔄 Merging 1 commit to main @ f907cce (no commit/squash/rebase needed)
+  * f907cce Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
index 4fa74d0fb..2c5fbac3c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
-  * 72ff5fc Add feature file
+🔄 Merging 1 commit to main @ d553927 (no commit/squash/rebase needed)
+  * d553927 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 944b07fdc..cd3ddec62 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
-  * 72ff5fc Add feature file
+🔄 Merging 1 commit to main @ d553927 (no commit/squash/rebase needed)
+  * d553927 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 75634a633..eb34b1eec 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -32,9 +32,9 @@ exit_code: 0
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to feature.txt
-✅ Committed changes @ cdc8f90
-🔄 Merging 1 commit to main @ cdc8f90 (no rebase needed)
-  * cdc8f90 Changes to feature.txt
+✅ Committed changes @ 544fecb
+🔄 Merging 1 commit to main @ 544fecb (no rebase needed)
+  * 544fecb Changes to feature.txt
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 7a1989874..a16f647dd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -30,8 +30,8 @@ exit_code: 0
  exit 0
🔄 Running project pre-merge test:
  exit 0
-🔄 Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
-  * 2cbe2a2 Add feature file
+🔄 Merging 1 commit to main @ 56c009e (no commit/squash/rebase needed)
+  * 56c009e Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
index 1aec4c46c..005d5ef4d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ f2d96c5 (no commit/squash/rebase needed)
-  * f2d96c5 Add feature file
+🔄 Merging 1 commit to main @ 959ea18 (no commit/squash/rebase needed)
+  * 959ea18 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 532606197..d1680437a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
🔄 Running project pre-merge:
  exit 0
-🔄 Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
-  * 4b1199c Add feature file
+🔄 Merging 1 commit to main @ 0ceef32 (no commit/squash/rebase needed)
+  * 0ceef32 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 83c0afc4a..e4c465f48 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -27,8 +27,8 @@ exit_code: 0
🔄 Running project pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
-🔄 Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
-  * 726717f Add feature file
+🔄 Merging 1 commit to main @ d4561b9 (no commit/squash/rebase needed)
+  * d4561b9 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index e28d24ecc..42a964642 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index 666b2d7c1..b7182f913 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
🔄 Rebasing onto main...
✅ Rebased onto main
-🔄 Merging 1 commit to main @ 76778cc (no commit/squash needed)
-  * 76778cc Add feature file
+🔄 Merging 1 commit to main @ 5a61dea (no commit/squash needed)
+  * 5a61dea Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index 9dac72cd9..44999e076 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index c6a5eb113..467cd096d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -26,7 +26,7 @@ exit_code: 1
🔄 Rebasing onto main...
❌ Rebase onto main incomplete
  Rebasing (1/1)
-  error: could not apply c661874... Update shared.txt in feature
-  Could not apply c661874... # Update shared.txt in feature
+  error: could not apply e1cf9a1... Update shared.txt in feature
+  Could not apply e1cf9a1... # Update shared.txt in feature
  Auto-merging shared.txt
  CONFLICT (content): Merge conflict in shared.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
index fbe4bbb47..8464c5e9c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
🔄 Rebasing onto main...
✅ Rebased onto main
-🔄 Merging 1 commit to main @ ae48a8e (no commit/squash needed)
-  * ae48a8e Add feature
+🔄 Merging 1 commit to main @ 0bb882f (no commit/squash needed)
+  * 0bb882f Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 7016fb806..fba801031 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -32,9 +32,9 @@ exit_code: 0
  - feat: add file 1
  - fix: update logic
  - docs: update readme
-✅ Squashed @ 27eb169
-🔄 Merging 1 commit to main @ 27eb169 (no rebase needed)
-  * 27eb169 Squash commits from main
+✅ Squashed @ dd1e5fd
+🔄 Merging 1 commit to main @ dd1e5fd (no rebase needed)
+  * dd1e5fd Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  file3.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index c20238746..d41c0cbdd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
-  * 525a81f feat: single commit
+🔄 Merging 1 commit to main @ e26db67 (no commit/squash/rebase needed)
+  * e26db67 feat: single commit
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index c3a8d5a2c..000bf7293 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
@@ -26,9 +26,9 @@ exit_code: 0
🔄 Squashing 2 commits into a single commit (1 file, +1)...
🔄 Generating squash commit message...
  feat: implement user authentication system
-✅ Squashed @ d42412f
-🔄 Merging 1 commit to main @ d42412f (no rebase needed)
-  * d42412f feat: implement user authentication system
+✅ Squashed @ a0c80b0
+🔄 Merging 1 commit to main @ a0c80b0 (no rebase needed)
+  * a0c80b0 feat: implement user authentication system
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
index 311119aa7..3d36ff827 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
@@ -26,12 +26,12 @@ exit_code: 0
----- stderr -----
🔄 Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-💡 Backup created @ 330ccd6
+💡 Backup created @ e997a6b
🔄 Generating squash commit message...
  fix: update files
-✅ Squashed @ 49dd855
-🔄 Merging 1 commit to main @ 49dd855 (no rebase needed)
-  * 49dd855 fix: update files
+✅ Squashed @ 06dba69
+🔄 Merging 1 commit to main @ 06dba69 (no rebase needed)
+  * 06dba69 fix: update files
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index ef64f7e1c..924b8279c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
index 26a3c127e..247c1082e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
🔄 Rebasing onto staging...
✅ Rebased onto staging
-🔄 Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
-  * 8280b9e Add feature for staging
+🔄 Merging 1 commit to staging @ 4240724 (no commit/squash needed)
+  * 4240724 Add feature for staging
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to staging (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
index 700e30884..a855e45c5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
index 66937af47..9575725d5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 9dac72cd9..44999e076 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-  * 6551244 Add feature file
+🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index 7f7fe4804..a8ee1259d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
@@ -29,12 +29,12 @@ exit_code: 0
  untracked1.txt
  untracked2.txt
🔄 Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
-💡 Backup created @ 4967998
+💡 Backup created @ b8f4f9c
🔄 Generating squash commit message...
  fix: commit changes
-✅ Squashed @ ffd7e7b
-🔄 Merging 1 commit to main @ ffd7e7b (no rebase needed)
-  * ffd7e7b fix: commit changes
+✅ Squashed @ c785ba8
+🔄 Merging 1 commit to main @ c785ba8 (no rebase needed)
+  * c785ba8 fix: commit changes
  file1.txt | 1 +
  untracked1.txt | 1 +
  untracked2.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index 3e6097728..d00552112 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -36,7 +36,7 @@ exit_code: 0
  - Implement token refresh mechanism with expiry handling
  - Add JWT encoding/decoding with signature verification
  - Create test suite covering all authentication flows
-✅ Squashed @ 95c3316
+✅ Squashed @ 25c560f
🔄 Running project pre-merge test:
  cargo test
 Finished test [unoptimized + debuginfo] target(s) in 0.12s
@@ -53,8 +53,8 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin
  cargo clippy
 Checking worktrunk v0.1.0
Finished dev [unoptimized + debuginfo] target(s) in 1.23s
-🔄 Merging 1 commit to main @ 95c3316 (no rebase needed)
-  * 95c3316 feat(auth): Implement JWT authentication system
+🔄 Merging 1 commit to main @ 25c560f (no rebase needed)
+  * 25c560f feat(auth): Implement JWT authentication system
  auth.rs | 8 ++++++++
  auth_test.rs | 17 +++++++++++++++++
  jwt.rs | 8 ++++++++
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
index 64802d4d3..928991ee9 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
@@ -31,7 +31,7 @@ exit_code: 0
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
-✅ Created worktree feature-x based off main @ [REPO].feature-x
+✅ Created new worktree for feature-x from main at [REPO].feature-x
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start dev:
  uv run dev
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
index dee09da6d..8df109c99 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
@@ -31,7 +31,7 @@ exit_code: 0
 
  Implement login and token refresh endpoints with JWT validation.
  Includes comprehensive test coverage and input validation.
-✅ Squashed @ 69200cc
+✅ Squashed @ 34e674c
🔄 Running project pre-merge test:
  uv run pytest
@@ -49,8 +49,8 @@ tests/test_auth.py::test_token_validation PASSED [100%]
All checks passed!
-🔄 Merging 1 commit to main @ 69200cc (no rebase needed)
-  * 69200cc feat(api): Add user authentication endpoints
+🔄 Merging 1 commit to main @ 34e674c (no rebase needed)
+  * 34e674c feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 014f62817..2bd6a81ce 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
-  * d29e0fd Implement JWT validation
+🔄 Merging 1 commit to main @ 0fc2285 (no commit/squash/rebase needed)
+  * 0fc2285 Implement JWT validation
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
✅ Merged to main (1 commit, 1 file, +13)
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
index a6f319245..8faef25ce 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
@@ -24,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree fix-auth based off main @ [REPO].fix-auth
+✅ Created new worktree for fix-auth from main at [REPO].fix-auth
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
index 269a013a9..8b56d2d0e 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
@@ -30,4 +30,4 @@ exit_code: 0
⚪ Skipping pre-commit hooks (--no-verify)
🔄 Generating commit message and committing tracked changes... (1 file, +1, -1)
  fix: update file
-✅ Committed changes @ 0b66aac
+✅ Committed changes @ 720fda9
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
index 4fc357823..6b209e0b1 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
@@ -32,4 +32,4 @@ exit_code: 0
  file1.txt
🔄 Generating commit message and committing changes... (2 files, +2)
  feat: add file
-✅ Committed changes @ 83bd654
+✅ Committed changes @ f8c8262
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
index 8907c595e..324e00b86 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
@@ -28,4 +28,4 @@ exit_code: 0
----- stderr -----
🔄 Generating commit message and committing tracked changes... (1 file, +1, -1)
  fix: update tracked file
-✅ Committed changes @ 979ff99
+✅ Committed changes @ e6cf891
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
index 7f034b555..cec3889e7 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
@@ -29,7 +29,7 @@ exit_code: 0
----- stderr -----
⚪ Skipping pre-commit hooks (--no-verify)
🔄 Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
-💡 Backup created @ 31e06e8
+💡 Backup created @ 209c929
🔄 Generating squash commit message...
  squash: combined commits
-✅ Squashed @ f5ad358
+✅ Squashed @ 08bd578
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
index fa00cb1b5..da560a21e 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
@@ -30,4 +30,4 @@ exit_code: 0
🔄 Squashing 2 commits into a single commit (3 files, +3)...
🔄 Generating squash commit message...
  squash: combined commits
-✅ Squashed @ db8c691
+✅ Squashed @ 0c65059
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
index 1db40856b..770669817 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stderr -----
🔄 Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
-💡 Backup created @ ba1424b
+💡 Backup created @ b7407a4
🔄 Generating squash commit message...
  squash: combined commits
-✅ Squashed @ 072b879
+✅ Squashed @ d5e34f6
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index 833563138..cd8aff18d 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -28,7 +28,7 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'Setup done' > setup.txt
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start server:
  sleep 0.05 && echo 'Server running' > server.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index 8390a1cfd..d6f91413b 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -28,7 +28,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
🔄 Running project post-start:
  echo 'Background task' > background.txt
🔄 Executing (--execute):
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
index 1d6ad6a0d..7c013a5e4 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap
@@ -29,5 +29,5 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'Default: main' > default.txt
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index 7c26a3e91..a248eddfa 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -29,5 +29,5 @@ exit_code: 0
🔄 Running project post-create:
  exit 1
🟡 Command failed: exit status: 1
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
index 25f0841fe..8ad99536e 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap
@@ -28,12 +28,12 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create commit:
-  echo 'Commit: d5f94f04f2d59bd7282f575b929b659aefa65f2e' > git_vars.txt
+  echo 'Commit: 549b3f44d1c4dfb3c7a36090fda2db14ff8b90df' > git_vars.txt
🔄 Running project post-create short:
-  echo 'Short: d5f94f0' >> git_vars.txt
+  echo 'Short: 549b3f4' >> git_vars.txt
🔄 Running project post-create remote:
  echo 'Remote: origin' >> git_vars.txt
🔄 Running project post-create worktree_name:
  echo 'Worktree Name: repo.feature' >> git_vars.txt
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
index daf9ae377..49812c37a 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
@@ -32,5 +32,5 @@ exit_code: 0
  else
  echo 'File exists' > result.txt
  fi
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
index c805a7bb6..6607debbd 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -32,5 +32,5 @@ exit_code: 0
🔄 Running project post-create setup:
  echo 'Running setup'
Running setup
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
index 72f709921..f6cfdc284 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
index 115c4efbc..57ba53111 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -29,5 +29,5 @@ exit_code: 0
🔄 Running project post-create:
  echo 'Setup complete'
Setup complete
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
index 90b232b0d..63ab4e466 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -34,5 +34,5 @@ exit_code: 0
  echo 'Worktree: [REPO].feature-test' >> info.txt
🔄 Running project post-create root:
  echo 'Root: [REPO]' >> info.txt
-✅ Created worktree feature/test based off main @ [REPO].feature-test
+✅ Created new worktree for feature/test from main at [REPO].feature-test
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
index 6540a047d..48efaacfb 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap
@@ -29,5 +29,5 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create:
  echo 'Upstream: ' > upstream.txt
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
index f2f72de42..2a5cc04ab 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'line1
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
index 12011478b..ede735be5 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'POST-START-RAN' > post_start_marker.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
index c595e48f2..afdaec908 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'unclosed quote
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
index 6f63c4aa0..ff922d1dd 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'stdout output' && echo 'stderr output' >&2
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
index 4dbb8455b..346e60f75 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  echo 'first line' > multiline.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
index ffe7df747..ccf6d4624 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start task1:
  echo 'Task 1 running' > task1.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
index f07df6770..ff09fe59e 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start task1:
  echo 'TASK1_OUTPUT'
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
index 2c9af19a6..cc86c3172 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running project post-start:
  sleep 0.1 && echo 'Background task done' > background.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
index ae4db0471..e7cd1946c 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
@@ -17,7 +17,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature at [REPO].feature; cd unavailable (no shell integration)
+🟡 Worktree for feature at [REPO].feature; cannot cd (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
index a029566a6..7b3f6c106 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
🔄 Stashing changes in [REPO]...
-🔄 Pushing 1 commit to main @ 6551244
-  * 6551244 Add feature file
+🔄 Pushing 1 commit to main @ 3cf9bf5
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
🔄 Restoring stashed changes in [REPO]...
diff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
index 59f4d7f82..4349a650d 100644
--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
@@ -25,6 +25,6 @@ exit_code: 1
----- stderr -----
❌ Can't push to local main branch: it has newer commits
-  * 5ca21c8 Main commit
+  * 26e1582 Main commit
💡 Use wt step rebase or wt merge to rebase onto main
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 5d288935b..240c042b2 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ c2e2bcc
-  * c2e2bcc Add test file
+🔄 Pushing 1 commit to main @ 23fcc89
+  * 23fcc89 Add test file
  test.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
index 633ab7bc1..49f387a7b 100644
--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 6551244
-  * 6551244 Add feature file
+🔄 Pushing 1 commit to main @ 3cf9bf5
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index 4b0905718..2a2181389 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 4af48f0
-  * 4af48f0 Add feature file
+🔄 Pushing 1 commit to main @ 83771b6
+  * 83771b6 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index 633ab7bc1..49f387a7b 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 6551244
-  * 6551244 Add feature file
+🔄 Pushing 1 commit to main @ 3cf9bf5
+  * 3cf9bf5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index 557aa9e7c..fe0f49b2b 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
@@ -25,12 +25,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 3 commits to main @ 13bed7b (merge commits allowed)
-  * 13bed7b Merge temp
+🔄 Pushing 3 commits to main @ 519f364 (merge commits allowed)
+  * 519f364 Merge temp
  |/
-  | * 1f38fab Commit 2
+  | * 37cd3fe Commit 2
  |/
-  * a184b7f Commit 1
+  * ac37628 Commit 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
index 2ae624740..5583dc291 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
@@ -24,4 +24,4 @@ exit_code: 0
----- stderr -----
🔄 Removing feature-unmerged worktree in background; retaining unmerged branch
-💡 Use wt remove -D to delete unmerged branches
+💡 wt remove -D deletes unmerged branches
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
index 9af287f20..ca2cae1a3 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch feature-unmerged
⚪ Branch feature-unmerged retained; has unmerged changes
-💡 Use wt remove -D to delete unmerged branches
+💡 wt remove -D deletes unmerged branches
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index 26372a8fd..5c5f030ba 100644
--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature _ ./repo.feature f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+@ main ^ ./repo ecfb1c3a 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature _ ./repo.feature ecfb1c3a 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
index e36a1b9eb..ba1b2ec21 100644
--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
@@ -23,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . 23e5a150 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
index a6f45a321..2b40e6dfa 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ also-no-changes _ ./repo.also-no-changes b834638e 1d Initial commit
-+ no-changes _ ./repo.no-changes b834638e 1d Initial commit
-+ with-changes ! +1 -1 ./repo.with-changes b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ also-no-changes _ ./repo.also-no-changes 23e5a150 1d Initial commit
++ no-changes _ ./repo.no-changes 23e5a150 1d Initial commit
++ with-changes ! +1 -1 ./repo.with-changes 23e5a150 1d Initial commit
-⚪ Showing 4 worktrees; 1 with changes
+⚪ Showing 4 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
index 425670c22..b7895b539 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ huge ? _ ./repo.huge b834638e 1d Initial commit
-+ tiny ! +1 -1 ./repo.tiny b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ huge ? _ ./repo.huge 23e5a150 1d Initial commit
++ tiny ! +1 -1 ./repo.tiny 23e5a150 1d Initial commit
-⚪ Showing 3 worktrees; 1 with changes
+⚪ Showing 3 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
index c59af0b86..053da7d47 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-large ? _ ./repo.feature-large b834638e 1d Initial commit
-+ feature-medium ? _ ./repo.feature-medium b834638e 1d Initial commit
-+ feature-small ? _ ./repo.feature-small b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ feature-large ? _ ./repo.feature-large 23e5a150 1d Initial commit
++ feature-medium ? _ ./repo.feature-medium 23e5a150 1d Initial commit
++ feature-small ? _ ./repo.feature-small 23e5a150 1d Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
index e4a6fd121..1efb3830e 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./repo b834638e 1d
-+ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here b834638e 1d
-+ short _ ./repo.short b834638e 1d
-+ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 1d
+@ main ^ ./repo 23e5a150 1d
++ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here 23e5a150 1d
++ short _ ./repo.short 23e5a150 1d
++ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name 23e5a150 1d
-⚪ Showing 4 worktrees; 1 column hidden
+⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
index 5d41975ce..e11a03c4b 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^ b834638e 1d Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues _ b834638e 1d Initial commit
-+ medium _ b834638e 1d Initial commit
-+ x _ b834638e 1d Initial commit
+@ main ^ 23e5a150 1d Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues _ 23e5a150 1d Initial commit
++ medium _ 23e5a150 1d Initial commit
++ x _ 23e5a150 1d Initial commit
-⚪ Showing 4 worktrees; 1 column hidden
+⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
index c107a4001..7e1cc249a 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ a _ ./repo.a b834638e 1d Initial commit
-+ bb _ ./repo.bb b834638e 1d Initial commit
-+ ccc _ ./repo.ccc b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ a _ ./repo.a 23e5a150 1d Initial commit
++ bb _ ./repo.bb 23e5a150 1d Initial commit
++ ccc _ ./repo.ccc 23e5a150 1d Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index 40182cf32..98705e387 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ cafe _ ./repo.cafe b834638e 1d Initial commit
-+ naive _ ./repo.naive b834638e 1d Initial commit
-+ resume _ ./repo.resume b834638e 1d Initial commit
+@ main ^ ./repo 23e5a150 1d Initial commit
++ cafe _ ./repo.cafe 23e5a150 1d Initial commit
++ naive _ ./repo.naive 23e5a150 1d Initial commit
++ resume _ ./repo.resume 23e5a150 1d Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
index 93a5cbb37..d6c777d09 100644
--- a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
+++ b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
@@ -28,5 +28,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree new-feature based off main @ [REPO].new-feature
+✅ Created new worktree for new-feature from main at [REPO].new-feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap
index e662cba1d..ef198fa30 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to feature-a @ [REPO].feature-a
+✅ Switched to worktree for feature-a at [REPO].feature-a
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap
index 75831d5f1..971780a6f 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap
@@ -17,7 +17,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for main at [REPO]; cd unavailable (no shell integration)
+🟡 Worktree for main at [REPO]; cannot cd (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap
index 02fe03524..cb0852e81 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap
@@ -17,7 +17,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-a at [REPO].feature-a; cd unavailable (no shell integration)
+🟡 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap
index f07316a82..dae80143b 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap
@@ -17,7 +17,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for main at [REPO]; cd unavailable (no shell integration)
+🟡 Worktree for main at [REPO]; cannot cd (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap
index 02fe03524..cb0852e81 100644
--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap
+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap
@@ -17,7 +17,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-a at [REPO].feature-a; cd unavailable (no shell integration)
+🟡 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
index d6b772094..aebd20d29 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
@@ -19,7 +19,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -27,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 --base is only used with --create; ignoring
+🟡 --base flag is only used with --create, ignoring
⚪ Already on worktree for main at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
index 098c8261d..c1db5dcaf 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: false
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
index 344cb48c5..36b77a6a5 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature-x based off main @ [REPO].feature-x
+✅ Created new worktree for feature-x from main at [REPO].feature-x
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
index 429dc1425..0c02dfaee 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index e9a7a11f1..60f13111a 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
@@ -28,5 +28,5 @@ exit_code: 0
----- stderr -----
🟡 Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
💡 Use wt switch remote-feature (without --create) to switch to the remote branch
-✅ Created worktree remote-feature based off main @ [REPO].remote-feature
+✅ Created new worktree for remote-feature from main at [REPO].remote-feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
index bfe2abbae..68adf6c79 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to main @ [REPO].main
+✅ Switched to worktree for main at [REPO].main
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index d0cf9685a..fb54913e8 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -28,6 +28,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree file-test based off main @ [REPO].file-test
+✅ Created new worktree for file-test from main at [REPO].file-test
🔄 Executing (--execute):
  echo 'test content' > test.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index 471111c5e..3d0b30c01 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -27,6 +27,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to existing-exec @ [REPO].existing-exec
+✅ Switched to worktree for existing-exec at [REPO].existing-exec
🔄 Executing (--execute):
  echo 'existing worktree' > existing.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index e67510798..719f4150d 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -28,6 +28,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-✅ Created worktree fail-test based off main @ [REPO].fail-test
+✅ Created new worktree for fail-test from main at [REPO].fail-test
🔄 Executing (--execute):
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index ac9e698bb..c4c1aca0e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -31,7 +31,7 @@ line2
line3
----- stderr -----
-✅ Created worktree multiline-test based off main @ [REPO].multiline-test
+✅ Created new worktree for multiline-test from main at [REPO].multiline-test
🔄 Executing (--execute):
  echo 'line1'
  echo 'line2'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index 4331eb20b..3cbcdd33c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -29,6 +29,6 @@ exit_code: 0
test output
----- stderr -----
-✅ Created worktree exec-test based off main @ [REPO].exec-test
+✅ Created new worktree for exec-test from main at [REPO].exec-test
🔄 Executing (--execute):
  echo 'test output'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
index f938cf4b8..02db36f0b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
@@ -17,7 +17,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-z at [REPO].feature-z; cd unavailable (no shell integration)
+🟡 Worktree for feature-z at [REPO].feature-z; cannot cd (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
index bf06acb93..bc07e9d2b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
@@ -27,4 +27,4 @@ exit_code: 0
cd '[REPO].existing-wt'
----- stderr -----
-✅ Switched to existing-wt @ [REPO].existing-wt
+✅ Switched to worktree for existing-wt at [REPO].existing-wt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
index 31559352a..97f68f4e5 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
@@ -17,7 +17,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to shell-configured @ [REPO].shell-configured
+✅ Switched to worktree for shell-configured at [REPO].shell-configured
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
index da85f279f..e880149c6 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
@@ -31,6 +31,6 @@ cd '[REPO].exit-code-test'
exit 42
----- stderr -----
-✅ Created worktree exit-code-test based off main @ [REPO].exit-code-test
+✅ Created new worktree for exit-code-test from main at [REPO].exit-code-test
🔄 Executing (--execute):
  exit 42
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
index 9d785287e..711193aa8 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
@@ -32,7 +32,7 @@ echo 'doing work'
exit 7
----- stderr -----
-✅ Created worktree output-exit-test based off main @ [REPO].output-exit-test
+✅ Created new worktree for output-exit-test from main at [REPO].output-exit-test
🔄 Executing (--execute):
  echo 'doing work'
  exit 7
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
index 6ae95cc8a..455b00b0c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
@@ -28,4 +28,4 @@ exit_code: 0
cd '[REPO].internal-test'
----- stderr -----
-✅ Created worktree internal-test based off main @ [REPO].internal-test
+✅ Created new worktree for internal-test from main at [REPO].internal-test
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index 563ef7fda..741a11bbe 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
@@ -32,7 +32,7 @@ echo 'line1'
echo 'line2'
----- stderr -----
-✅ Created worktree exec-internal based off main @ [REPO].exec-internal
+✅ Created new worktree for exec-internal from main at [REPO].exec-internal
🔄 Executing (--execute):
  echo 'line1'
  echo 'line2'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap
index 5e049897b..72b613b86 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
index e662cba1d..ef198fa30 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to feature-a @ [REPO].feature-a
+✅ Switched to worktree for feature-a at [REPO].feature-a
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
index 33eab4158..6f093c4a8 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
@@ -30,6 +30,6 @@ exit_code: 0
execute command runs
----- stderr -----
-✅ Created worktree no-hooks-test based off main @ [REPO].no-hooks-test
+✅ Created new worktree for no-hooks-test from main at [REPO].no-hooks-test
🔄 Executing (--execute):
  echo 'execute command runs'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
index 468260ba2..625673e71 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
@@ -29,6 +29,6 @@ exit_code: 0
execute still runs
----- stderr -----
-✅ Switched to existing-no-hooks @ [REPO].existing-no-hooks
+✅ Switched to worktree for existing-no-hooks at [REPO].existing-no-hooks
🔄 Executing (--execute):
  echo 'execute still runs'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
index ed056e1cd..935fa1a11 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
@@ -19,7 +19,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -27,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree no-post-start based off main @ [REPO].no-post-start
+✅ Created new worktree for no-post-start from main at [REPO].no-post-start
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
index e332da541..9fbc9420c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
@@ -20,7 +20,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -28,5 +27,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree force-no-hooks based off main @ [REPO].force-no-hooks
+✅ Created new worktree for force-no-hooks from main at [REPO].force-no-hooks
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
index e3d9c0839..41c6ff823 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature-from-main based off main @ [REPO].feature-from-main
+✅ Created new worktree for feature-from-main from main at [REPO].feature-from-main
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap
index 8ab4a0e70..df13528d5 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for branch-a at [REPO].branch-a; cd unavailable (no shell integration)
+🟡 Worktree for branch-a at [REPO].branch-a; cannot cd (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_second_dash.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_second_dash.snap
index 85bc55090..d06def97c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_second_dash.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_second_dash.snap
@@ -17,6 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap
index f27c1b6ea..b30eb583b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to branch-a @ [REPO].branch-a
+✅ Switched to worktree for branch-a at [REPO].branch-a
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap
index 71fafea18..1b0817088 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to branch-b @ [REPO].branch-b
+✅ Switched to worktree for branch-b at [REPO].branch-b
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
index 592184e30..a3f3597c9 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
@@ -17,7 +17,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for existing-branch at [REPO].existing-branch; cd unavailable (no shell integration)
+🟡 Worktree for existing-branch at [REPO].existing-branch; cannot cd (no shell integration)
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
index 7e8c6b988..c5c2a4627 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -20,7 +20,6 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1735776000"
- USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -28,5 +27,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature-with-base based off main @ [REPO].feature-with-base
+✅ Created new worktree for feature-with-base from main at [REPO].feature-with-base
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap b/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
index 3222d27cb..7261d6686 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
index abf4cae8b..094c55fcd 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running user post-start bg:
  echo 'USER_POST_START' > user_bg.txt
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
index 629a6cd77..c636fa50f 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stderr -----
🔄 Running user post-create vars:
  echo 'repo=repo branch=feature' > template_vars.txt
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
index eddbc49c0..188909f58 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap
@@ -28,5 +28,5 @@ exit_code: 0
  echo 'USER_HOOK' >> hook_order.txt
🔄 Running project post-create:
  echo 'PROJECT_HOOK' >> hook_order.txt
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
index 9cc38a408..6387d2978 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stderr -----
🔄 Running user post-create setup:
  echo 'NO_APPROVAL_NEEDED' > no_approval.txt
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
index 15f01da7a..4d66babdc 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stderr -----
🔄 Running user post-create log:
  echo 'USER_POST_CREATE_RAN' > user_hook_marker.txt
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
index b1b48a550..c09454092 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap
@@ -27,5 +27,5 @@ exit_code: 0
🔄 Running user post-create failing:
  exit 1
🟡 Command failing failed: exit status: 1
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap
index bc9f9b0ee..79c079339 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 66266ec (no commit/squash/rebase needed)
-  * 66266ec Add feature
+🔄 Merging 1 commit to main @ 90f2330 (no commit/squash/rebase needed)
+  * 90f2330 Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
index a530a9c56..3ce19570e 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
🔄 Running user post-start bg:
  echo 'USER_POST_START_RAN' > user_bg_marker.txt
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
index 3222d27cb..7261d6686 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created worktree feature based off main @ [REPO].feature
+✅ Created new worktree for feature from main at [REPO].feature
💡 Run wt config shell install to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
index 120141ff4..74c2f13c9 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
@@ -32,9 +32,9 @@ exit_code: 0
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to uncommitted.txt
-✅ Committed changes @ dd71589
-🔄 Merging 1 commit to main @ dd71589 (no rebase needed)
-  * dd71589 Changes to uncommitted.txt
+✅ Committed changes @ 234d7f9
+🔄 Merging 1 commit to main @ 234d7f9 (no rebase needed)
+  * 234d7f9 Changes to uncommitted.txt
  uncommitted.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap
index 4eb021d4b..6c11ae3fe 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap
@@ -27,8 +27,8 @@ exit_code: 0
----- stderr -----
🔄 Running user pre-merge check:
  echo 'USER_PRE_MERGE_RAN' > user_premerge.txt
-🔄 Merging 1 commit to main @ 66266ec (no commit/squash/rebase needed)
-  * 66266ec Add feature
+🔄 Merging 1 commit to main @ 90f2330 (no commit/squash/rebase needed)
+  * 90f2330 Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap
index 5a56de979..afe988af3 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 66266ec (no commit/squash/rebase needed)
-  * 66266ec Add feature
+🔄 Merging 1 commit to main @ 90f2330 (no commit/squash/rebase needed)
+  * 90f2330 Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)