Skip to content

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

perf(tests): add pre-built fixture to speed up Windows CI (#634)

Maximilian Rooscd8ac3e06086
diff --git a/.claude-plugin/skills/worktrunk/reference/claude-code.md b/.claude-plugin/skills/worktrunk/reference/claude-code.md
index 04fd0f293..be5683759 100644
--- a/.claude-plugin/skills/worktrunk/reference/claude-code.md
+++ b/.claude-plugin/skills/worktrunk/reference/claude-code.md
@@ -29,10 +29,10 @@ The plugin tracks Claude sessions with status markers in `wt list`:
<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>
-@ main <span class=d>^</span> . <span class=d>a058e792</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>95e48b49</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>46b6a187</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
-+ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>a058e792</span> <span class=d>1d</span> <span class=d>Initial commit</span>
+@ main <span class=d>^</span><span class=d>⇡</span> . <span class=g>⇡1</span> <span class=d>33323bc1</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>70343f03</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>a585d6ed</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
++ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead</span>
diff --git a/.claude-plugin/skills/worktrunk/reference/list.md b/.claude-plugin/skills/worktrunk/reference/list.md
index 60dc5d3c7..d9cbef778 100644
--- a/.claude-plugin/skills/worktrunk/reference/list.md
+++ b/.claude-plugin/skills/worktrunk/reference/list.md
@@ -10,9 +10,9 @@ List all worktrees:
<span class="prompt">$</span> <span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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>⇡3</span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</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=d>|</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>
+@ feature-api <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>⇡3</span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</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=d>|</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
@@ -20,9 +20,9 @@ Include CI status and line diffs:
<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>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <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>●</span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure t…</span>
+@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <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>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
@@ -30,11 +30,11 @@ Include branches that don't have worktrees:
<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>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <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>●</span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure t…</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>99e114de</span> <span class=d>2d</span> <span class=d>Add GraphQL…</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>d62fd0e8</span> <span class=d>3d</span> <span class=d>Start API do…</span>
+@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <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>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</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>96379229</span> <span class=d>2d</span> <span class=d>Add GraphQL…</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>b40716dc</span> <span class=d>3d</span> <span class=d>Start API do…</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
diff --git a/.claude-plugin/skills/worktrunk/reference/tips-patterns.md b/.claude-plugin/skills/worktrunk/reference/tips-patterns.md
index a0f2c9783..1882cbb37 100644
--- a/.claude-plugin/skills/worktrunk/reference/tips-patterns.md
+++ b/.claude-plugin/skills/worktrunk/reference/tips-patterns.md
@@ -53,9 +53,9 @@ The URL column in `wt list` shows each worktree's dev server:
<span class="prompt">$</span> <span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>URL</b> <b>Commit</b> <b>Age</b>
-@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>6088adb3</span> <span class=d>4d</span>
-+ feature-api <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>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>ec97decc</span> <span class=d>30m</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=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>127407de</span> <span class=d>5h</span>
+@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span> <span class=d>4d</span>
++ feature-api <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>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>6814f02a</span> <span class=d>30m</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=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span> <span class=d>5h</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
diff --git a/Taskfile.yaml b/Taskfile.yaml
index d23d5a276..8376de3c5 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -218,6 +218,87 @@ tasks:
echo "Done:"
ls -lh "$OUTPUT_DIR"/*.png
+ test:create-standard-fixture:
+ desc: Create/recreate the standard test fixture (repo + worktrees + remote)
+ dir: "{{.REPO_ROOT}}"
+ cmds:
+ - |
+ set -euo pipefail
+
+ FIXTURE_DIR="tests/fixtures/standard"
+ TIMESTAMP="2025-01-01T00:00:00"
+
+ echo "Creating standard test fixture..."
+
+ # Clean slate
+ rm -rf "$FIXTURE_DIR"
+ mkdir -p "$FIXTURE_DIR"
+ cd "$FIXTURE_DIR"
+
+ # Create the main repo
+ git init repo
+ cd repo
+
+ # Configure for deterministic output (disable GPG signing)
+ git config user.name "Test User"
+ git config user.email "[email protected]"
+ git config commit.gpgsign false
+
+ # Initial commit on main
+ echo "initial content" > file.txt
+ cat > .gitattributes << 'EOF'
+ * text=auto eol=lf
+ EOF
+ git add -A
+ GIT_AUTHOR_DATE="$TIMESTAMP" GIT_COMMITTER_DATE="$TIMESTAMP" \
+ git commit -m "Initial commit"
+
+ # Create bare remote and push
+ cd ..
+ git clone --bare repo origin.git
+ cd repo
+ git remote add origin ../origin.git
+ git push -u origin main
+
+ # Create worktrees with commits
+ for branch in feature-a feature-b feature-c; do
+ git worktree add -b "$branch" "../repo.$branch"
+ echo "$branch content" > "../repo.$branch/$branch.txt"
+ git -C "../repo.$branch" add "$branch.txt"
+ GIT_AUTHOR_DATE="$TIMESTAMP" GIT_COMMITTER_DATE="$TIMESTAMP" \
+ git -C "../repo.$branch" commit -m "Add $branch file"
+ done
+
+ cd ..
+
+ # Rename .git directories to _git to avoid git treating fixture as repo
+ mv repo/.git repo/_git
+ mv origin.git origin_git
+ for wt in repo.feature-a repo.feature-b repo.feature-c; do
+ # Worktrees have .git files pointing to main repo, rename those too
+ mv "$wt/.git" "$wt/_git"
+ done
+
+ # Update worktree gitdir references (they point to .git, need to point to _git)
+ for wt in feature-a feature-b feature-c; do
+ # Fix the gitdir file in worktree (it's a file, not a directory)
+ sed -i.bak 's/\.git/_git/g' "repo.$wt/_git"
+ rm -f "repo.$wt/_git.bak"
+ # Fix the worktree config in main repo (worktree dir is repo.$wt)
+ sed -i.bak 's/\.git/_git/g' "repo/_git/worktrees/repo.$wt/gitdir"
+ rm -f "repo/_git/worktrees/repo.$wt/gitdir.bak"
+ done
+
+ # Fix remote URL (origin.git -> origin_git)
+ sed -i.bak 's/origin\.git/origin_git/g' "repo/_git/config"
+ rm -f "repo/_git/config.bak"
+
+ echo ""
+ echo "Created fixture structure:"
+ find . -maxdepth 2 -type d | head -20
+ echo ""
+ echo "Done! Fixture at: tests/fixtures/standard/"
+
generate-logo:
desc: Generate logo using Gemini AI
dir: "{{.REPO_ROOT}}"
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index 8989d5d43..2863bae99 100644
--- a/docs/content/claude-code.md
+++ b/docs/content/claude-code.md
@@ -38,10 +38,10 @@ The plugin tracks Claude sessions with status markers in `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>
-@ main <span class=d>^</span> . <span class=d>a058e792</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>95e48b49</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>46b6a187</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
-+ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>a058e792</span> <span class=d>1d</span> <span class=d>Initial commit</span>
+@ main <span class=d>^</span><span class=d>⇡</span> . <span class=g>⇡1</span> <span class=d>33323bc1</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>70343f03</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>a585d6ed</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
++ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead</span>
{% end %}
diff --git a/docs/content/list.md b/docs/content/list.md
index 7b33a440c..0d516bb9c 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -28,9 +28,9 @@ 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>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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>⇡3</span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</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=d>|</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>
+@ feature-api <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>⇡3</span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</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=d>|</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
{% end %}
@@ -44,9 +44,9 @@ 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>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <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>●</span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure t…</span>
+@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <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>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
{% end %}
@@ -60,11 +60,11 @@ 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>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <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>●</span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure t…</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>99e114de</span> <span class=d>2d</span> <span class=d>Add GraphQL…</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>d62fd0e8</span> <span class=d>3d</span> <span class=d>Start API do…</span>
+@ feature-api <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> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <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>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</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> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</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>96379229</span> <span class=d>2d</span> <span class=d>Add GraphQL…</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>b40716dc</span> <span class=d>3d</span> <span class=d>Start API do…</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
{% end %}
diff --git a/docs/content/tips-patterns.md b/docs/content/tips-patterns.md
index 33eb5c6cf..e6b54ba2f 100644
--- a/docs/content/tips-patterns.md
+++ b/docs/content/tips-patterns.md
@@ -62,9 +62,9 @@ The URL column in `wt list` shows each worktree's dev server:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>URL</b> <b>Commit</b> <b>Age</b>
-@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>6088adb3</span> <span class=d>4d</span>
-+ feature-api <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>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>ec97decc</span> <span class=d>30m</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=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>127407de</span> <span class=d>5h</span>
+@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span> <span class=d>4d</span>
++ feature-api <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>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>6814f02a</span> <span class=d>30m</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=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span> <span class=d>5h</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
{% end %}
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 8ddf69616..218c0ac48 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -397,49 +397,170 @@ use tempfile::TempDir;
use worktrunk::config::sanitize_branch_name;
use worktrunk::path::to_posix_path;
-/// 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")
+/// Path to the standard fixture (relative to crate root).
+/// Contains repo/, repo.feature-a/, repo.feature-b/, repo.feature-c/, origin_git/.
+fn standard_fixture_path() -> PathBuf {
+ PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures/standard")
}
-/// 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();
+/// Worktree info returned from fixture copy.
+struct FixtureWorktrees {
+ worktrees: HashMap<String, PathBuf>,
+ remote: PathBuf,
+}
+
+/// Copy the standard fixture to create a new test repo with worktrees and remote.
+///
+/// The fixture contains:
+/// - Main repo on `main` branch with one commit
+/// - Remote (origin) bare repository
+/// - Three feature worktrees (feature-a, feature-b, feature-c) each with one commit
+///
+/// Uses platform-specific copy command which benchmarks faster than native Rust fs operations.
+fn copy_standard_fixture(dest: &Path) -> FixtureWorktrees {
+ let fixture = standard_fixture_path();
+
+ // Copy all entries from fixture
+ for entry in std::fs::read_dir(&fixture).unwrap() {
+ let entry = entry.unwrap();
+ let src = entry.path();
+ let dest_name = entry.file_name();
+ let dest_path = dest.join(&dest_name);
+ let is_dir = entry.file_type().unwrap().is_dir();
+
+ // Use Rust's fs::copy for files (cross-platform)
+ if !is_dir {
+ std::fs::copy(&src, &dest_path)
+ .unwrap_or_else(|e| panic!("Failed to copy file {:?}: {}", src, e));
+ continue;
+ }
+
+ #[cfg(unix)]
+ {
+ let output = Command::new("cp")
+ .args(["-r", "--"])
+ .arg(&src)
+ .arg(&dest_path)
+ .output()
+ .expect("Failed to run cp command");
+ assert!(
+ output.status.success(),
+ "Failed to copy fixture directory {:?}: {}",
+ src,
+ String::from_utf8_lossy(&output.stderr)
+ );
+ }
+
+ #[cfg(windows)]
+ {
+ // Use robocopy on Windows for directories (exits 0-7 for success)
+ let output = Command::new("robocopy")
+ .args(["/E", "/NFL", "/NDL", "/NJH", "/NJS", "/NC", "/NS", "/NP"])
+ .arg(&src)
+ .arg(&dest_path)
+ .output()
+ .expect("Failed to run robocopy command");
+ // Robocopy returns 0-7 for various success states
+ let code = output.status.code().unwrap_or(99);
+ assert!(
+ code <= 7,
+ "Failed to copy fixture directory {:?}: exit code {}, stderr: {}",
+ src,
+ code,
+ String::from_utf8_lossy(&output.stderr)
+ );
+ }
+ }
+
+ // Verify essential directories exist after copy
+ let essential = ["repo/_git", "origin_git", "repo.feature-a/_git"];
+ for path in essential {
+ let full_path = dest.join(path);
+ assert!(
+ full_path.exists(),
+ "Essential fixture path missing after copy: {:?}",
+ full_path
+ );
+ }
+
+ // Rename _git to .git in all locations
+ let renames = [
+ ("repo/_git", "repo/.git"),
+ ("origin_git", "origin.git"),
+ ("repo.feature-a/_git", "repo.feature-a/.git"),
+ ("repo.feature-b/_git", "repo.feature-b/.git"),
+ ("repo.feature-c/_git", "repo.feature-c/.git"),
+ ];
+ for (from, to) in renames {
+ let from_path = dest.join(from);
+ let to_path = dest.join(to);
+ if from_path.exists() {
+ std::fs::rename(&from_path, &to_path).unwrap_or_else(|e| {
+ panic!("Failed to rename {:?} to {:?}: {}", from_path, to_path, e)
+ });
+ }
+ }
+
+ // Verify origin.git is a valid bare repository
+ let origin_git = dest.join("origin.git");
assert!(
- output.status.success(),
- "Failed to copy template _git directory"
+ origin_git.join("HEAD").exists(),
+ "origin.git is not a valid git repository (missing HEAD): {:?}",
+ origin_git
);
- // Copy file.txt (part of the initial commit)
- std::fs::copy(template.join("file.txt"), repo_path.join("file.txt")).unwrap();
+ // Canonicalize dest for worktrees map (on macOS /var -> /private/var)
+ let canonical_dest = canonicalize(dest).unwrap();
+
+ // Fix gitdir files - fixture uses _git which we rename to .git
+ // Paths are relative so no absolute path replacement needed
+ for wt in ["feature-a", "feature-b", "feature-c"] {
+ let gitdir_path = dest.join(format!("repo.{wt}/.git"));
+ if gitdir_path.exists() {
+ let content = std::fs::read_to_string(&gitdir_path).unwrap();
+ let fixed = content.replace("_git", ".git");
+ std::fs::write(&gitdir_path, fixed).unwrap();
+ }
+
+ // Fix main repo's worktree gitdir reference
+ let main_gitdir = dest.join(format!("repo/.git/worktrees/repo.{wt}/gitdir"));
+ if main_gitdir.exists() {
+ let content = std::fs::read_to_string(&main_gitdir).unwrap();
+ let fixed = content.replace("_git", ".git");
+ std::fs::write(&main_gitdir, fixed).unwrap();
+ }
+ }
+
+ // Fix remote URL in config (origin_git -> origin.git)
+ let config_path = dest.join("repo/.git/config");
+ if config_path.exists() {
+ let content = std::fs::read_to_string(&config_path).unwrap();
+ let fixed = content.replace("origin_git", "origin.git");
+ std::fs::write(&config_path, fixed).unwrap();
+ }
+
+ // Build worktrees map using canonical paths
+ let mut worktrees = HashMap::new();
+ for wt in ["feature-a", "feature-b", "feature-c"] {
+ worktrees.insert(wt.to_string(), canonical_dest.join(format!("repo.{wt}")));
+ }
+
+ let remote = canonical_dest.join("origin.git");
+
+ FixtureWorktrees { worktrees, remote }
+}
- // Copy .gitattributes (forces LF line endings on all platforms)
- std::fs::copy(
- template.join(".gitattributes"),
- repo_path.join(".gitattributes"),
+/// Write a gitconfig file for tests.
+fn write_test_gitconfig(path: &Path) {
+ std::fs::write(
+ path,
+ "[user]\n\tname = Test User\n\temail = [email protected]\n\
+ [advice]\n\tmergeConflict = false\n\tresolveConflict = false\n\
+ [init]\n\tdefaultBranch = main\n\
+ [commit]\n\tgpgsign = false\n\
+ [rerere]\n\tenabled = true\n",
)
.unwrap();
-
- // Copy gitconfig
- std::fs::copy(template.join("gitconfig"), dest.join("test-gitconfig")).unwrap();
}
/// Canonicalize a path without Windows verbatim prefix (`\\?\`).
@@ -832,18 +953,21 @@ pub struct TestRepo {
impl TestRepo {
/// 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.
+ /// The repo includes:
+ /// - Main branch with one initial commit
+ /// - Remote (origin) bare repository
+ /// - Three feature worktrees (feature-a, feature-b, feature-c) each with one commit
+ ///
+ /// Uses a pre-created fixture for fast initialization - copies the fixture
+ /// from `tests/fixtures/standard/` instead of running git commands.
///
/// Also sets up mock gh/glab commands that appear authenticated to prevent
/// CI status hints from appearing in test output.
pub fn new() -> Self {
let temp_dir = TempDir::new().unwrap();
- // Copy from fixture template (includes initial commit)
- copy_fixture_template(temp_dir.path());
+ // Copy from standard fixture (includes worktrees and remote)
+ let fixture = copy_standard_fixture(temp_dir.path());
// Canonicalize to resolve symlinks (important on macOS where /var is symlink to /private/var)
let root = canonicalize(&temp_dir.path().join("repo")).unwrap();
@@ -852,15 +976,18 @@ impl TestRepo {
let test_config_path = temp_dir.path().join("test-config.toml");
let git_config_path = temp_dir.path().join("test-gitconfig");
+ // Write gitconfig for tests
+ write_test_gitconfig(&git_config_path);
+
// Bind full snapshot settings (including ANSI cleanup) for all tests
- let worktrees = HashMap::new();
- let snapshot_guard = setup_snapshot_settings_for_paths(&root, &worktrees).bind_to_scope();
+ let snapshot_guard =
+ setup_snapshot_settings_for_paths(&root, &fixture.worktrees).bind_to_scope();
let mut repo = Self {
temp_dir,
root,
- worktrees,
- remote: None,
+ worktrees: fixture.worktrees,
+ remote: Some(fixture.remote),
test_config_path,
git_config_path,
mock_bin_path: None,
@@ -1028,6 +1155,36 @@ impl TestRepo {
String::from_utf8_lossy(&output.stdout).trim().to_string()
}
+ /// Remove fixture worktrees to get a clean state for tests.
+ ///
+ /// The standard fixture includes worktrees for feature-a, feature-b, feature-c.
+ /// Call this method in tests that need a specific worktree state. Also clears
+ /// the worktrees map so `add_worktree` can recreate them if needed.
+ pub fn remove_fixture_worktrees(&mut self) {
+ for branch in &["feature-a", "feature-b", "feature-c"] {
+ let worktree_path = self
+ .root_path()
+ .parent()
+ .unwrap()
+ .join(format!("repo.{}", branch));
+ if worktree_path.exists() {
+ let _ = self
+ .git_command()
+ .args([
+ "worktree",
+ "remove",
+ "--force",
+ worktree_path.to_str().unwrap(),
+ ])
+ .output();
+ }
+ // Delete the branch after removing the worktree
+ let _ = self.git_command().args(["branch", "-D", branch]).output();
+ // Remove from worktrees map so add_worktree() can recreate if needed
+ self.worktrees.remove(*branch);
+ }
+ }
+
/// Stage all changes in a directory.
pub fn stage_all(&self, dir: &Path) {
self.run_git_in(dir, &["add", "."]);
@@ -1127,6 +1284,21 @@ impl TestRepo {
&self.root
}
+ /// Get the project identifier for test configs.
+ ///
+ /// Returns the repository directory name. This works because the standard
+ /// fixture uses a local path remote (`../origin_git`) which doesn't parse
+ /// as a proper git URL, causing worktrunk to fall back to the directory name.
+ ///
+ /// Use this when writing test configs with `[projects."<id>"]` sections.
+ pub fn project_id(&self) -> String {
+ self.root
+ .file_name()
+ .and_then(|n| n.to_str())
+ .unwrap_or("repo")
+ .to_string()
+ }
+
/// Get the path to the isolated test config file
///
/// This config path is automatically set via WORKTRUNK_CONFIG_PATH when using
@@ -1252,7 +1424,15 @@ impl TestRepo {
///
/// The worktree path follows the default template format: `repo.{branch}`
/// (sanitized, with slashes replaced by dashes).
+ ///
+ /// If the worktree already exists (from the standard fixture), returns its path
+ /// without creating a new one.
pub fn add_worktree(&mut self, branch: &str) -> PathBuf {
+ // If worktree already exists (from fixture), just return its path
+ if let Some(path) = self.worktrees.get(branch) {
+ return path.clone();
+ }
+
let safe_branch = sanitize_branch_name(branch);
// Use default template path format: ../{{ repo }}.{{ branch }}
// From {temp_dir}/repo, this resolves to {temp_dir}/repo.{branch}
@@ -1422,9 +1602,23 @@ impl TestRepo {
/// This creates a bare git repository in the temp directory and configures
/// it with the specified remote name. The remote will have the same default
/// branch as the local repository.
+ ///
+ /// If the remote already exists (from fixture), this is a no-op.
pub fn setup_custom_remote(&mut self, remote_name: &str, default_branch: &str) {
+ // If origin remote already exists (from fixture), just ensure HEAD is set
+ if remote_name == "origin" && self.remote.is_some() {
+ // Set origin/HEAD (fixture may not have this set)
+ self.run_git(&["remote", "set-head", "origin", default_branch]);
+ return;
+ }
+
// Create bare remote repository
let remote_path = self.temp_dir.path().join(format!("{}.git", remote_name));
+ if remote_path.exists() {
+ // Remote directory already exists, just use it
+ self.remote = Some(canonicalize(&remote_path).unwrap());
+ return;
+ }
std::fs::create_dir(&remote_path).unwrap();
self.run_git_in(
diff --git a/tests/fixtures/standard/.gitattributes b/tests/fixtures/standard/.gitattributes
new file mode 100644
index 000000000..49768657b
--- /dev/null
+++ b/tests/fixtures/standard/.gitattributes
@@ -0,0 +1,7 @@
+# Ensure git internal files always use LF line endings
+# These files are part of the test fixture and must not have CRLF
+**/packed-refs text eol=lf
+**/HEAD text eol=lf
+**/config text eol=lf
+**/_git text eol=lf
+**/gitdir text eol=lf
diff --git a/tests/fixtures/standard/origin_git/HEAD b/tests/fixtures/standard/origin_git/HEAD
new file mode 100644
index 000000000..b870d8262
--- /dev/null
+++ b/tests/fixtures/standard/origin_git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/tests/fixtures/standard/origin_git/config b/tests/fixtures/standard/origin_git/config
new file mode 100644
index 000000000..e6da23157
--- /dev/null
+++ b/tests/fixtures/standard/origin_git/config
@@ -0,0 +1,6 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = true
+ ignorecase = true
+ precomposeunicode = true
diff --git a/tests/fixtures/standard/origin_git/objects/05/a4a45d0b981dad5c27db59dca482836d59f89e b/tests/fixtures/standard/origin_git/objects/05/a4a45d0b981dad5c27db59dca482836d59f89e
new file mode 100644
index 000000000..b325244fc
--- /dev/null
+++ b/tests/fixtures/standard/origin_git/objects/05/a4a45d0b981dad5c27db59dca482836d59f89e
@@ -0,0 +1,3 @@
+x��K
+1D]�}%��dq�^�O��dZ��<�����*�Z �Zԁ;����e :)�٢�'G*��$Kθ ����Ýv��N�<�>��V:�V/ÊzQv���J)F;�x����m+\�
+?��ß7O
\ No newline at end of file
diff --git a/tests/fixtures/standard/origin_git/objects/36/c83deb35b9f3b5d103f838429e1f626d8e969b b/tests/fixtures/standard/origin_git/objects/36/c83deb35b9f3b5d103f838429e1f626d8e969b
new file mode 100644
index 000000000..49332c870
Binary files /dev/null and b/tests/fixtures/standard/origin_git/objects/36/c83deb35b9f3b5d103f838429e1f626d8e969b differ
diff --git a/tests/fixtures/standard/origin_git/objects/63/13b56c57848efce05faa7aa7e901ccfc2886ea b/tests/fixtures/standard/origin_git/objects/63/13b56c57848efce05faa7aa7e901ccfc2886ea
new file mode 100644
index 000000000..18ba92c92
Binary files /dev/null and b/tests/fixtures/standard/origin_git/objects/63/13b56c57848efce05faa7aa7e901ccfc2886ea differ
diff --git a/tests/fixtures/standard/origin_git/objects/f2/376e2bab6c5194410bd8a55630f83f933d2f34 b/tests/fixtures/standard/origin_git/objects/f2/376e2bab6c5194410bd8a55630f83f933d2f34
new file mode 100644
index 000000000..758356d63
Binary files /dev/null and b/tests/fixtures/standard/origin_git/objects/f2/376e2bab6c5194410bd8a55630f83f933d2f34 differ
diff --git a/tests/fixtures/standard/origin_git/objects/info/.gitkeep b/tests/fixtures/standard/origin_git/objects/info/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/origin_git/objects/pack/.gitkeep b/tests/fixtures/standard/origin_git/objects/pack/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/origin_git/packed-refs b/tests/fixtures/standard/origin_git/packed-refs
new file mode 100644
index 000000000..2c6b05039
--- /dev/null
+++ b/tests/fixtures/standard/origin_git/packed-refs
@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled sorted
+05a4a45d0b981dad5c27db59dca482836d59f89e refs/heads/main
diff --git a/tests/fixtures/standard/origin_git/refs/heads/.gitkeep b/tests/fixtures/standard/origin_git/refs/heads/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/origin_git/refs/tags/.gitkeep b/tests/fixtures/standard/origin_git/refs/tags/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/repo.feature-a/.gitattributes b/tests/fixtures/standard/repo.feature-a/.gitattributes
new file mode 100644
index 000000000..6313b56c5
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-a/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/tests/fixtures/standard/repo.feature-a/_git b/tests/fixtures/standard/repo.feature-a/_git
new file mode 100644
index 000000000..0c7059880
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-a/_git
@@ -0,0 +1 @@
+gitdir: ../repo/_git/worktrees/repo.feature-a
diff --git a/tests/fixtures/standard/repo.feature-a/feature-a.txt b/tests/fixtures/standard/repo.feature-a/feature-a.txt
new file mode 100644
index 000000000..b65f36274
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-a/feature-a.txt
@@ -0,0 +1 @@
+feature-a content
diff --git a/tests/fixtures/standard/repo.feature-a/file.txt b/tests/fixtures/standard/repo.feature-a/file.txt
new file mode 100644
index 000000000..f2376e2ba
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-a/file.txt
@@ -0,0 +1 @@
+initial content
diff --git a/tests/fixtures/standard/repo.feature-b/.gitattributes b/tests/fixtures/standard/repo.feature-b/.gitattributes
new file mode 100644
index 000000000..6313b56c5
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/tests/fixtures/standard/repo.feature-b/_git b/tests/fixtures/standard/repo.feature-b/_git
new file mode 100644
index 000000000..60fcb4cfb
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-b/_git
@@ -0,0 +1 @@
+gitdir: ../repo/_git/worktrees/repo.feature-b
diff --git a/tests/fixtures/standard/repo.feature-b/feature-b.txt b/tests/fixtures/standard/repo.feature-b/feature-b.txt
new file mode 100644
index 000000000..50bf5f908
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-b/feature-b.txt
@@ -0,0 +1 @@
+feature-b content
diff --git a/tests/fixtures/standard/repo.feature-b/file.txt b/tests/fixtures/standard/repo.feature-b/file.txt
new file mode 100644
index 000000000..f2376e2ba
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-b/file.txt
@@ -0,0 +1 @@
+initial content
diff --git a/tests/fixtures/standard/repo.feature-c/.gitattributes b/tests/fixtures/standard/repo.feature-c/.gitattributes
new file mode 100644
index 000000000..6313b56c5
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-c/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/tests/fixtures/standard/repo.feature-c/_git b/tests/fixtures/standard/repo.feature-c/_git
new file mode 100644
index 000000000..58b82dbd5
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-c/_git
@@ -0,0 +1 @@
+gitdir: ../repo/_git/worktrees/repo.feature-c
diff --git a/tests/fixtures/standard/repo.feature-c/feature-c.txt b/tests/fixtures/standard/repo.feature-c/feature-c.txt
new file mode 100644
index 000000000..c52c448c9
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-c/feature-c.txt
@@ -0,0 +1 @@
+feature-c content
diff --git a/tests/fixtures/standard/repo.feature-c/file.txt b/tests/fixtures/standard/repo.feature-c/file.txt
new file mode 100644
index 000000000..f2376e2ba
--- /dev/null
+++ b/tests/fixtures/standard/repo.feature-c/file.txt
@@ -0,0 +1 @@
+initial content
diff --git a/tests/fixtures/standard/repo/.gitattributes b/tests/fixtures/standard/repo/.gitattributes
new file mode 100644
index 000000000..6313b56c5
--- /dev/null
+++ b/tests/fixtures/standard/repo/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/tests/fixtures/standard/repo/_git/COMMIT_EDITMSG b/tests/fixtures/standard/repo/_git/COMMIT_EDITMSG
new file mode 100644
index 000000000..5852f4463
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/COMMIT_EDITMSG
@@ -0,0 +1 @@
+Initial commit
diff --git a/tests/fixtures/standard/repo/_git/HEAD b/tests/fixtures/standard/repo/_git/HEAD
new file mode 100644
index 000000000..b870d8262
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/tests/fixtures/standard/repo/_git/MERGE_RR b/tests/fixtures/standard/repo/_git/MERGE_RR
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/repo/_git/config b/tests/fixtures/standard/repo/_git/config
new file mode 100644
index 000000000..c7b21ac31
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/config
@@ -0,0 +1,18 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+ ignorecase = true
+ precomposeunicode = true
+[user]
+ name = Test User
+[commit]
+ gpgsign = false
+[remote "origin"]
+ url = ../origin_git
+ fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "main"]
+ remote = origin
+ merge = refs/heads/main
diff --git a/tests/fixtures/standard/repo/_git/index b/tests/fixtures/standard/repo/_git/index
new file mode 100644
index 000000000..c5b6ba4b6
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/index differ
diff --git a/tests/fixtures/standard/repo/_git/logs/HEAD b/tests/fixtures/standard/repo/_git/logs/HEAD
new file mode 100644
index 000000000..6a8e3979a
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/logs/HEAD
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1735718400 -0800 commit (initial): Initial commit
diff --git a/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-a b/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-a
new file mode 100644
index 000000000..107380906
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-a
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425029 -0800 branch: Created from HEAD
+05a4a45d0b981dad5c27db59dca482836d59f89e 1b87d4731ea707905d15a726e193531c20affa14 Test User <[email protected]> 1735718400 -0800 commit: Add feature-a file
diff --git a/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-b b/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-b
new file mode 100644
index 000000000..45e10a634
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-b
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425030 -0800 branch: Created from HEAD
+05a4a45d0b981dad5c27db59dca482836d59f89e f62940fcec424585adf98625e722fdf990810614 Test User <[email protected]> 1735718400 -0800 commit: Add feature-b file
diff --git a/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-c b/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-c
new file mode 100644
index 000000000..514104a97
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/logs/refs/heads/feature-c
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425030 -0800 branch: Created from HEAD
+05a4a45d0b981dad5c27db59dca482836d59f89e 345c7c93ad7c3d8f5b08380898d78e024019599c Test User <[email protected]> 1735718400 -0800 commit: Add feature-c file
diff --git a/tests/fixtures/standard/repo/_git/logs/refs/heads/main b/tests/fixtures/standard/repo/_git/logs/refs/heads/main
new file mode 100644
index 000000000..6a8e3979a
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/logs/refs/heads/main
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1735718400 -0800 commit (initial): Initial commit
diff --git a/tests/fixtures/standard/repo/_git/logs/refs/remotes/origin/main b/tests/fixtures/standard/repo/_git/logs/refs/remotes/origin/main
new file mode 100644
index 000000000..e241a8e0c
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/logs/refs/remotes/origin/main
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425029 -0800 update by push
diff --git a/tests/fixtures/standard/repo/_git/objects/05/a4a45d0b981dad5c27db59dca482836d59f89e b/tests/fixtures/standard/repo/_git/objects/05/a4a45d0b981dad5c27db59dca482836d59f89e
new file mode 100644
index 000000000..b325244fc
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/objects/05/a4a45d0b981dad5c27db59dca482836d59f89e
@@ -0,0 +1,3 @@
+x��K
+1D]�}%��dq�^�O��dZ��<�����*�Z �Zԁ;����e :)�٢�'G*��$Kθ ����Ýv��N�<�>��V:�V/ÊzQv���J)F;�x����m+\�
+?��ß7O
\ No newline at end of file
diff --git a/tests/fixtures/standard/repo/_git/objects/06/64db7d9288255732c25f781d12776b2a1dacd3 b/tests/fixtures/standard/repo/_git/objects/06/64db7d9288255732c25f781d12776b2a1dacd3
new file mode 100644
index 000000000..e96723649
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/06/64db7d9288255732c25f781d12776b2a1dacd3 differ
diff --git a/tests/fixtures/standard/repo/_git/objects/0a/c7152205cb4a7515a71568e8d6f811ef1862e1 b/tests/fixtures/standard/repo/_git/objects/0a/c7152205cb4a7515a71568e8d6f811ef1862e1
new file mode 100644
index 000000000..5850e9dc1
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/0a/c7152205cb4a7515a71568e8d6f811ef1862e1 differ
diff --git a/tests/fixtures/standard/repo/_git/objects/1b/87d4731ea707905d15a726e193531c20affa14 b/tests/fixtures/standard/repo/_git/objects/1b/87d4731ea707905d15a726e193531c20affa14
new file mode 100644
index 000000000..60877e43c
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/objects/1b/87d4731ea707905d15a726e193531c20affa14
@@ -0,0 +1,2 @@
+x��Q
+�0��)��d�m�;���-�-1��7W�ox̃)ۺ. ��UU��d��1%$� ���1��.���U_ ,q�@b��*e�,�C��G�<���?��U�����N��E���O=�m=����K�Zl����׵n��3W��ۧ��0/O5?�E�
\ No newline at end of file
diff --git a/tests/fixtures/standard/repo/_git/objects/34/5c7c93ad7c3d8f5b08380898d78e024019599c b/tests/fixtures/standard/repo/_git/objects/34/5c7c93ad7c3d8f5b08380898d78e024019599c
new file mode 100644
index 000000000..3aee59357
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/objects/34/5c7c93ad7c3d8f5b08380898d78e024019599c
@@ -0,0 +1 @@
+x��Qj1 D��S� ��Zk������L�lp���+�o�1���v��t��PK&���I3�賸�\��+���S�?: k�Ć�"dj\b��+�$�4/U��׽���:\^�૏���=�~*�� �'�$ �(�a�����p6����͏������E�
\ No newline at end of file
diff --git a/tests/fixtures/standard/repo/_git/objects/36/c83deb35b9f3b5d103f838429e1f626d8e969b b/tests/fixtures/standard/repo/_git/objects/36/c83deb35b9f3b5d103f838429e1f626d8e969b
new file mode 100644
index 000000000..49332c870
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/36/c83deb35b9f3b5d103f838429e1f626d8e969b differ
diff --git a/tests/fixtures/standard/repo/_git/objects/50/bf5f908b3a3d39dfbd19d219c265bc1c8471df b/tests/fixtures/standard/repo/_git/objects/50/bf5f908b3a3d39dfbd19d219c265bc1c8471df
new file mode 100644
index 000000000..dac82f9be
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/50/bf5f908b3a3d39dfbd19d219c265bc1c8471df differ
diff --git a/tests/fixtures/standard/repo/_git/objects/63/13b56c57848efce05faa7aa7e901ccfc2886ea b/tests/fixtures/standard/repo/_git/objects/63/13b56c57848efce05faa7aa7e901ccfc2886ea
new file mode 100644
index 000000000..18ba92c92
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/63/13b56c57848efce05faa7aa7e901ccfc2886ea differ
diff --git a/tests/fixtures/standard/repo/_git/objects/b6/5f3627464edc75c2a61f859bb0799d215495e3 b/tests/fixtures/standard/repo/_git/objects/b6/5f3627464edc75c2a61f859bb0799d215495e3
new file mode 100644
index 000000000..5c1023a68
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/b6/5f3627464edc75c2a61f859bb0799d215495e3 differ
diff --git a/tests/fixtures/standard/repo/_git/objects/c5/2c448c99cf63bd4934e45cb759d4b57637b921 b/tests/fixtures/standard/repo/_git/objects/c5/2c448c99cf63bd4934e45cb759d4b57637b921
new file mode 100644
index 000000000..7e2ae56c4
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/c5/2c448c99cf63bd4934e45cb759d4b57637b921 differ
diff --git a/tests/fixtures/standard/repo/_git/objects/eb/0a17dea104217bd4169f79b56e2d7c736fe94c b/tests/fixtures/standard/repo/_git/objects/eb/0a17dea104217bd4169f79b56e2d7c736fe94c
new file mode 100644
index 000000000..0bcea3432
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/eb/0a17dea104217bd4169f79b56e2d7c736fe94c differ
diff --git a/tests/fixtures/standard/repo/_git/objects/f2/376e2bab6c5194410bd8a55630f83f933d2f34 b/tests/fixtures/standard/repo/_git/objects/f2/376e2bab6c5194410bd8a55630f83f933d2f34
new file mode 100644
index 000000000..758356d63
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/objects/f2/376e2bab6c5194410bd8a55630f83f933d2f34 differ
diff --git a/tests/fixtures/standard/repo/_git/objects/f6/2940fcec424585adf98625e722fdf990810614 b/tests/fixtures/standard/repo/_git/objects/f6/2940fcec424585adf98625e722fdf990810614
new file mode 100644
index 000000000..4a2c109f3
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/objects/f6/2940fcec424585adf98625e722fdf990810614
@@ -0,0 +1,2 @@
+x��[
+�0E��*f�ɫI@D�� �d&X���)�|��.�s��e����So" I����S )�Q ��X%��Vj�逞9ϘS�L� �}�B.�hG���$���Z<d��ܤ���&_�׷��2_A냎���ǻ~��u�� U��M� uz��=�Fm
\ No newline at end of file
diff --git a/tests/fixtures/standard/repo/_git/objects/info/.gitkeep b/tests/fixtures/standard/repo/_git/objects/info/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/repo/_git/objects/pack/.gitkeep b/tests/fixtures/standard/repo/_git/objects/pack/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/repo/_git/refs/heads/feature-a b/tests/fixtures/standard/repo/_git/refs/heads/feature-a
new file mode 100644
index 000000000..a9335a56e
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/refs/heads/feature-a
@@ -0,0 +1 @@
+1b87d4731ea707905d15a726e193531c20affa14
diff --git a/tests/fixtures/standard/repo/_git/refs/heads/feature-b b/tests/fixtures/standard/repo/_git/refs/heads/feature-b
new file mode 100644
index 000000000..9e2fdee43
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/refs/heads/feature-b
@@ -0,0 +1 @@
+f62940fcec424585adf98625e722fdf990810614
diff --git a/tests/fixtures/standard/repo/_git/refs/heads/feature-c b/tests/fixtures/standard/repo/_git/refs/heads/feature-c
new file mode 100644
index 000000000..81f33695b
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/refs/heads/feature-c
@@ -0,0 +1 @@
+345c7c93ad7c3d8f5b08380898d78e024019599c
diff --git a/tests/fixtures/standard/repo/_git/refs/heads/main b/tests/fixtures/standard/repo/_git/refs/heads/main
new file mode 100644
index 000000000..345edbeba
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/refs/heads/main
@@ -0,0 +1 @@
+05a4a45d0b981dad5c27db59dca482836d59f89e
diff --git a/tests/fixtures/standard/repo/_git/refs/remotes/origin/main b/tests/fixtures/standard/repo/_git/refs/remotes/origin/main
new file mode 100644
index 000000000..345edbeba
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/refs/remotes/origin/main
@@ -0,0 +1 @@
+05a4a45d0b981dad5c27db59dca482836d59f89e
diff --git a/tests/fixtures/standard/repo/_git/refs/tags/.gitkeep b/tests/fixtures/standard/repo/_git/refs/tags/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/COMMIT_EDITMSG b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/COMMIT_EDITMSG
new file mode 100644
index 000000000..e3a15ad6c
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/COMMIT_EDITMSG
@@ -0,0 +1 @@
+Add feature-a file
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/HEAD
new file mode 100644
index 000000000..8791ff63a
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/feature-a
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/MERGE_RR b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/MERGE_RR
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/ORIG_HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/ORIG_HEAD
new file mode 100644
index 000000000..345edbeba
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/ORIG_HEAD
@@ -0,0 +1 @@
+05a4a45d0b981dad5c27db59dca482836d59f89e
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/commondir b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/commondir
new file mode 100644
index 000000000..aab0408ce
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/commondir
@@ -0,0 +1 @@
+../..
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/gitdir b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/gitdir
new file mode 100644
index 000000000..ec20442f4
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/gitdir
@@ -0,0 +1 @@
+../../../../repo.feature-a/_git
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/index b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/index
new file mode 100644
index 000000000..5b322a651
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/index differ
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/logs/HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/logs/HEAD
new file mode 100644
index 000000000..41c8a4a8f
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-a/logs/HEAD
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425029 -0800
+05a4a45d0b981dad5c27db59dca482836d59f89e 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425029 -0800 reset: moving to HEAD
+05a4a45d0b981dad5c27db59dca482836d59f89e 1b87d4731ea707905d15a726e193531c20affa14 Test User <[email protected]> 1735718400 -0800 commit: Add feature-a file
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/COMMIT_EDITMSG b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/COMMIT_EDITMSG
new file mode 100644
index 000000000..7739cd356
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/COMMIT_EDITMSG
@@ -0,0 +1 @@
+Add feature-b file
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/HEAD
new file mode 100644
index 000000000..6c83ec9df
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/feature-b
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/MERGE_RR b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/MERGE_RR
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/ORIG_HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/ORIG_HEAD
new file mode 100644
index 000000000..345edbeba
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/ORIG_HEAD
@@ -0,0 +1 @@
+05a4a45d0b981dad5c27db59dca482836d59f89e
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/commondir b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/commondir
new file mode 100644
index 000000000..aab0408ce
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/commondir
@@ -0,0 +1 @@
+../..
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/gitdir b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/gitdir
new file mode 100644
index 000000000..98fce501a
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/gitdir
@@ -0,0 +1 @@
+../../../../repo.feature-b/_git
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/index b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/index
new file mode 100644
index 000000000..c056666c9
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/index differ
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/logs/HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/logs/HEAD
new file mode 100644
index 000000000..7b3cecc3c
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-b/logs/HEAD
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425030 -0800
+05a4a45d0b981dad5c27db59dca482836d59f89e 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425030 -0800 reset: moving to HEAD
+05a4a45d0b981dad5c27db59dca482836d59f89e f62940fcec424585adf98625e722fdf990810614 Test User <[email protected]> 1735718400 -0800 commit: Add feature-b file
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/COMMIT_EDITMSG b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/COMMIT_EDITMSG
new file mode 100644
index 000000000..dda93e2b7
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/COMMIT_EDITMSG
@@ -0,0 +1 @@
+Add feature-c file
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/HEAD
new file mode 100644
index 000000000..0150b9032
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/feature-c
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/MERGE_RR b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/MERGE_RR
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/ORIG_HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/ORIG_HEAD
new file mode 100644
index 000000000..345edbeba
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/ORIG_HEAD
@@ -0,0 +1 @@
+05a4a45d0b981dad5c27db59dca482836d59f89e
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/commondir b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/commondir
new file mode 100644
index 000000000..aab0408ce
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/commondir
@@ -0,0 +1 @@
+../..
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/gitdir b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/gitdir
new file mode 100644
index 000000000..bec8f1ece
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/gitdir
@@ -0,0 +1 @@
+../../../../repo.feature-c/_git
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/index b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/index
new file mode 100644
index 000000000..2bab158c2
Binary files /dev/null and b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/index differ
diff --git a/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/logs/HEAD b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/logs/HEAD
new file mode 100644
index 000000000..b83b88cc1
--- /dev/null
+++ b/tests/fixtures/standard/repo/_git/worktrees/repo.feature-c/logs/HEAD
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425030 -0800
+05a4a45d0b981dad5c27db59dca482836d59f89e 05a4a45d0b981dad5c27db59dca482836d59f89e Test User <[email protected]> 1768425030 -0800 reset: moving to HEAD
+05a4a45d0b981dad5c27db59dca482836d59f89e 345c7c93ad7c3d8f5b08380898d78e024019599c Test User <[email protected]> 1735718400 -0800 commit: Add feature-c file
diff --git a/tests/fixtures/standard/repo/file.txt b/tests/fixtures/standard/repo/file.txt
new file mode 100644
index 000000000..f2376e2ba
--- /dev/null
+++ b/tests/fixtures/standard/repo/file.txt
@@ -0,0 +1 @@
+initial content
diff --git a/tests/integration_tests/approval_pty.rs b/tests/integration_tests/approval_pty.rs
index 99f2fcfab..82bbc07a6 100644
--- a/tests/integration_tests/approval_pty.rs
+++ b/tests/integration_tests/approval_pty.rs
@@ -157,6 +157,9 @@ fn test_env_vars_with_shell(repo: &TestRepo) -> Vec<(String, String)> {
#[rstest]
fn test_approval_prompt_accept(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(r#"post-create = "echo 'test command'""#);
repo.commit("Add config");
@@ -178,6 +181,9 @@ fn test_approval_prompt_accept(repo: TestRepo) {
#[rstest]
fn test_approval_prompt_decline(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(r#"post-create = "echo 'test command'""#);
repo.commit("Add config");
@@ -199,6 +205,9 @@ fn test_approval_prompt_decline(repo: TestRepo) {
#[rstest]
fn test_approval_prompt_multiple_commands(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(
r#"[post-create]
first = "echo 'First command'"
@@ -228,6 +237,9 @@ third = "echo 'Third command'"
/// See test_permission_error_prevents_save in approval_save.rs for details.
#[rstest]
fn test_approval_prompt_permission_error(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(r#"post-create = "echo 'test command'""#);
repo.commit("Add config");
@@ -290,6 +302,9 @@ fn test_approval_prompt_permission_error(repo: TestRepo) {
#[rstest]
fn test_approval_prompt_named_commands(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(
r#"[post-create]
install = "echo 'Installing dependencies...'"
@@ -329,6 +344,9 @@ test = "echo 'Running tests...'"
#[rstest]
fn test_approval_prompt_mixed_approved_unapproved_accept(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(
r#"[post-create]
first = "echo 'First command'"
@@ -339,12 +357,11 @@ third = "echo 'Third command'"
repo.commit("Add config");
// Pre-approve the second command
- let project_id = repo.root_path().file_name().unwrap().to_str().unwrap();
repo.write_test_config(&format!(
r#"[projects."{}"]
approved-commands = ["echo 'Second command'"]
"#,
- project_id
+ repo.project_id()
));
// Configure shell integration so we get the "Restart shell" hint instead of the prompt
@@ -388,6 +405,9 @@ approved-commands = ["echo 'Second command'"]
#[rstest]
fn test_approval_prompt_mixed_approved_unapproved_decline(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(
r#"[post-create]
first = "echo 'First command'"
@@ -398,12 +418,11 @@ third = "echo 'Third command'"
repo.commit("Add config");
// Pre-approve the second command
- let project_id = repo.root_path().file_name().unwrap().to_str().unwrap();
repo.write_test_config(&format!(
r#"[projects."{}"]
approved-commands = ["echo 'Second command'"]
"#,
- project_id
+ repo.project_id()
));
// Configure shell integration so we get the "Restart shell" hint instead of the prompt
@@ -453,6 +472,9 @@ approved-commands = ["echo 'Second command'"]
#[rstest]
fn test_approval_prompt_remove_decline(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Create a worktree to remove
let output = repo
.wt_command()
diff --git a/tests/integration_tests/approval_ui.rs b/tests/integration_tests/approval_ui.rs
index 4cf89ed87..7b2e1ac91 100644
--- a/tests/integration_tests/approval_ui.rs
+++ b/tests/integration_tests/approval_ui.rs
@@ -75,6 +75,9 @@ pwd = "cd {{ worktree_path }} && pwd"
#[rstest]
fn test_approval_mixed_approved_unapproved(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(
r#"[post-create]
first = "echo 'First command'"
@@ -86,12 +89,11 @@ third = "echo 'Third command'"
repo.commit("Add config");
// Pre-approve the second command
- let project_id = repo.root_path().file_name().unwrap().to_str().unwrap();
repo.write_test_config(&format!(
r#"[projects."{}"]
approved-commands = ["echo 'Second command'"]
"#,
- project_id
+ repo.project_id()
));
snapshot_approval(
@@ -131,17 +133,19 @@ fn test_yes_flag_does_not_save_approvals(repo: TestRepo) {
#[rstest]
fn test_already_approved_commands_skip_prompt(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(r#"post-create = "echo 'approved' > output.txt""#);
repo.commit("Add config");
// Pre-approve the command
- let project_id = repo.root_path().file_name().unwrap().to_str().unwrap();
repo.write_test_config(&format!(
r#"[projects."{}"]
approved-commands = ["echo 'approved' > output.txt"]
"#,
- project_id
+ repo.project_id()
));
// Should execute without prompting
@@ -153,6 +157,9 @@ approved-commands = ["echo 'approved' > output.txt"]
#[rstest]
fn test_decline_approval_skips_only_unapproved(repo: TestRepo) {
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.write_project_config(
r#"[post-create]
first = "echo 'First command'"
@@ -164,14 +171,13 @@ third = "echo 'Third command'"
repo.commit("Add config");
// Pre-approve the second command
- let project_id = repo.root_path().file_name().unwrap().to_str().unwrap();
fs::write(
repo.test_config_path(),
format!(
r#"[projects."{}"]
approved-commands = ["echo 'Second command'"]
"#,
- project_id
+ repo.project_id()
),
)
.unwrap();
diff --git a/tests/integration_tests/approvals.rs b/tests/integration_tests/approvals.rs
index e6610d4c2..2e668c73e 100644
--- a/tests/integration_tests/approvals.rs
+++ b/tests/integration_tests/approvals.rs
@@ -61,6 +61,8 @@ fn test_clear_approvals_no_approvals(repo: TestRepo) {
#[rstest]
fn test_clear_approvals_with_approvals(repo: TestRepo) {
+ // Remove origin so project_id uses directory name (matches test expectation)
+ repo.run_git(&["remote", "remove", "origin"]);
let project_id = format!("{}/origin", repo.root_path().display());
repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test'""#);
@@ -87,6 +89,8 @@ fn test_clear_approvals_global_no_approvals(repo: TestRepo) {
#[rstest]
fn test_clear_approvals_global_with_approvals(repo: TestRepo) {
+ // Remove origin so project_id uses directory name (matches test expectation)
+ repo.run_git(&["remote", "remove", "origin"]);
let project_id = format!("{}/origin", repo.root_path().display());
repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test'""#);
@@ -112,6 +116,8 @@ fn test_clear_approvals_global_with_approvals(repo: TestRepo) {
#[rstest]
fn test_clear_approvals_after_clear(repo: TestRepo) {
+ // Remove origin so project_id uses directory name (matches test expectation)
+ repo.run_git(&["remote", "remove", "origin"]);
let project_id = format!("{}/origin", repo.root_path().display());
repo.commit("Initial commit");
repo.write_project_config(r#"post-create = "echo 'test'""#);
@@ -138,6 +144,8 @@ fn test_clear_approvals_after_clear(repo: TestRepo) {
#[rstest]
fn test_clear_approvals_multiple_approvals(repo: TestRepo) {
+ // Remove origin so project_id uses directory name (matches test expectation)
+ repo.run_git(&["remote", "remove", "origin"]);
repo.write_project_config(
r#"
post-create = "echo 'first'"
diff --git a/tests/integration_tests/bare_repository.rs b/tests/integration_tests/bare_repository.rs
index 44190528e..eb441afb5 100644
--- a/tests/integration_tests/bare_repository.rs
+++ b/tests/integration_tests/bare_repository.rs
@@ -235,6 +235,26 @@ fn test_bare_repo_equivalent_to_normal_repo(repo: TestRepo) {
// This test verifies that bare repos behave identically to normal repos
// from the user's perspective
+ // Remove fixture worktrees to get a clean state with just main
+ for branch in &["feature-a", "feature-b", "feature-c"] {
+ let worktree_path = repo
+ .root_path()
+ .parent()
+ .unwrap()
+ .join(format!("repo.{}", branch));
+ if worktree_path.exists() {
+ repo.git_command()
+ .args([
+ "worktree",
+ "remove",
+ "--force",
+ worktree_path.to_str().unwrap(),
+ ])
+ .output()
+ .unwrap();
+ }
+ }
+
// Set up bare repo
let bare_test = BareRepoTest::new();
let bare_main = bare_test.create_worktree("main", "main");
diff --git a/tests/integration_tests/ci_status.rs b/tests/integration_tests/ci_status.rs
index 47a205e19..6e7fd9ed5 100644
--- a/tests/integration_tests/ci_status.rs
+++ b/tests/integration_tests/ci_status.rs
@@ -32,9 +32,10 @@ fn run_ci_status_test(repo: &mut TestRepo, snapshot_name: &str, pr_json: &str, r
/// Setup a repo with GitHub remote and feature worktree, returns head SHA
fn setup_github_repo_with_feature(repo: &mut TestRepo) -> String {
+ // Set origin URL (origin already exists from fixture, just update URL)
repo.run_git(&[
"remote",
- "add",
+ "set-url",
"origin",
"https://github.com/test-owner/test-repo.git",
]);
@@ -220,7 +221,7 @@ fn test_list_full_filters_by_repo_owner(mut repo: TestRepo) {
// Use different org name
repo.run_git(&[
"remote",
- "add",
+ "set-url",
"origin",
"https://github.com/my-org/test-repo.git",
]);
@@ -253,10 +254,10 @@ fn test_list_full_filters_by_repo_owner(mut repo: TestRepo) {
#[rstest]
fn test_list_full_with_platform_override_github(mut repo: TestRepo) {
- // Add a non-GitHub remote (bitbucket) - platform won't be auto-detected
+ // Set a non-GitHub remote (bitbucket) - platform won't be auto-detected
repo.run_git(&[
"remote",
- "add",
+ "set-url",
"origin",
"https://bitbucket.org/test-owner/test-repo.git",
]);
@@ -302,10 +303,10 @@ platform = "github"
#[rstest]
fn test_list_full_with_gitlab_remote(mut repo: TestRepo) {
- // Add GitLab remote - tests get_gitlab_host_for_repo path
+ // Set GitLab remote URL - tests get_gitlab_host_for_repo path
repo.run_git(&[
"remote",
- "add",
+ "set-url",
"origin",
"https://gitlab.example.com/test-owner/test-repo.git",
]);
@@ -327,10 +328,10 @@ fn test_list_full_with_gitlab_remote(mut repo: TestRepo) {
#[rstest]
fn test_list_full_with_invalid_platform_override(mut repo: TestRepo) {
- // Add GitHub remote
+ // Set GitHub remote URL
repo.run_git(&[
"remote",
- "add",
+ "set-url",
"origin",
"https://github.com/test-owner/test-repo.git",
]);
@@ -396,9 +397,10 @@ fn run_gitlab_ci_status_test(
/// Setup a repo with GitLab remote and feature worktree, returns head SHA
fn setup_gitlab_repo_with_feature(repo: &mut TestRepo) -> String {
+ // Set origin URL (origin already exists from fixture, just update URL)
repo.run_git(&[
"remote",
- "add",
+ "set-url",
"origin",
"https://gitlab.com/test-group/test-project.git",
]);
@@ -483,7 +485,7 @@ fn test_list_full_with_gitlab_filters_by_project_id(mut repo: TestRepo) {
// Use a specific project for our repo
repo.run_git(&[
"remote",
- "add",
+ "set-url",
"origin",
"https://gitlab.com/my-group/my-project.git",
]);
diff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rs
index 00ac719c0..8efa09e55 100644
--- a/tests/integration_tests/completion.rs
+++ b/tests/integration_tests/completion.rs
@@ -338,18 +338,14 @@ fn test_complete_excludes_remote_branches(repo: TestRepo) {
// Create local branches
repo.run_git(&["branch", "feature/local"]);
- // Set up a fake remote
- repo.run_git(&["remote", "add", "origin", "https://example.com/repo.git"]);
-
- // Create a remote-tracking branch by fetching from a local "remote"
- // First, create a bare repo to act as remote
+ // Create a new bare repo to act as remote (fixture already has origin remote)
let remote_dir = repo.root_path().parent().unwrap().join("remote.git");
repo.git_command()
.args(["init", "--bare", remote_dir.to_str().unwrap()])
.output()
.unwrap();
- // Update remote URL to point to our bare repo
+ // Update origin URL to point to our bare repo
repo.run_git(&["remote", "set-url", "origin", remote_dir.to_str().unwrap()]);
// Push to create remote branches
diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rs
index b69b370ad..8393f15fb 100644
--- a/tests/integration_tests/config_state.rs
+++ b/tests/integration_tests/config_state.rs
@@ -80,6 +80,9 @@ fn test_state_get_default_branch_no_remote(repo: TestRepo) {
#[rstest]
fn test_state_get_default_branch_fails_when_undetermined(repo: TestRepo) {
+ // Remove origin (fixture has it) - otherwise remote can determine default branch
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Rename main to something non-standard so default branch can't be determined
repo.git_command()
.args(["branch", "-m", "main", "xyz"])
@@ -149,9 +152,7 @@ fn test_state_clear_default_branch(mut repo: TestRepo) {
#[rstest]
fn test_state_clear_default_branch_empty(repo: TestRepo) {
- // Set up remote but don't set default branch cache
- repo.run_git(&["remote", "add", "origin", "https://example.com/repo.git"]);
-
+ // Fixture already has origin remote, no default branch cache set
let output = wt_state_cmd(&repo, "default-branch", "clear", &[])
.output()
.unwrap();
diff --git a/tests/integration_tests/default_branch.rs b/tests/integration_tests/default_branch.rs
index b8eadf1b1..ab60b52ff 100644
--- a/tests/integration_tests/default_branch.rs
+++ b/tests/integration_tests/default_branch.rs
@@ -68,6 +68,9 @@ fn test_get_default_branch_caches_result(#[from(repo_with_remote)] repo: TestRep
#[rstest]
fn test_get_default_branch_no_remote(repo: TestRepo) {
+ // Remove origin (fixture has it) for this no-remote test
+ repo.run_git(&["remote", "remove", "origin"]);
+
// No remote configured, should infer from local branches
// Since there's only one local branch, it should return that
let result = Repository::at(repo.root_path()).unwrap().default_branch();
@@ -98,6 +101,9 @@ fn test_get_default_branch_with_custom_remote(mut repo: TestRepo) {
#[rstest]
fn test_primary_remote_detects_custom_remote(mut repo: TestRepo) {
+ // Remove origin (fixture has it) so upstream becomes the primary
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Use "main" since that's the local branch - the test only cares about remote name detection
repo.setup_custom_remote("upstream", "main");
@@ -122,6 +128,9 @@ fn test_branch_exists_with_custom_remote(mut repo: TestRepo) {
#[rstest]
fn test_get_default_branch_no_remote_common_names_fallback(repo: TestRepo) {
+ // Remove origin (fixture has it) for this no-remote test
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Create additional branches (no remote configured)
repo.git_command()
.args(["branch", "feature"])
@@ -143,6 +152,9 @@ fn test_get_default_branch_no_remote_common_names_fallback(repo: TestRepo) {
#[rstest]
fn test_get_default_branch_no_remote_master_fallback(repo: TestRepo) {
+ // Remove origin (fixture has it) for this no-remote test
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Rename main to master, then create other branches
repo.git_command()
.args(["branch", "-m", "main", "master"])
@@ -168,6 +180,9 @@ fn test_get_default_branch_no_remote_master_fallback(repo: TestRepo) {
#[rstest]
fn test_default_branch_no_remote_uses_init_config(repo: TestRepo) {
+ // Remove origin (fixture has it) for this no-remote test
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Rename main to something non-standard, create the configured default
repo.git_command()
.args(["branch", "-m", "main", "primary"])
@@ -246,6 +261,9 @@ fn test_invalid_default_branch_config_returns_none_when_valid(repo: TestRepo) {
#[rstest]
fn test_get_default_branch_no_remote_fails_when_no_match(repo: TestRepo) {
+ // Remove origin (fixture has it) for this no-remote test
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Rename main to something non-standard
repo.git_command()
.args(["branch", "-m", "main", "xyz"])
@@ -268,6 +286,9 @@ fn test_get_default_branch_no_remote_fails_when_no_match(repo: TestRepo) {
#[rstest]
fn test_resolve_caret_fails_when_default_branch_unavailable(repo: TestRepo) {
+ // Remove origin (fixture has it) for this no-remote test
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Rename main to something non-standard so default branch can't be determined
repo.git_command()
.args(["branch", "-m", "main", "xyz"])
diff --git a/tests/integration_tests/e2e_shell_post_start.rs b/tests/integration_tests/e2e_shell_post_start.rs
index 1873d0f32..8fbb93530 100644
--- a/tests/integration_tests/e2e_shell_post_start.rs
+++ b/tests/integration_tests/e2e_shell_post_start.rs
@@ -28,7 +28,7 @@ fn test_shell_integration_post_start_background(#[case] shell: &str, repo: TestR
// Pre-approve the command
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["sleep 0.05 && echo 'Background task done' > bg_marker.txt"]
"#,
)
@@ -118,7 +118,7 @@ task2 = "sleep 0.05 && echo 'Task 2' > task2.txt"
// Pre-approve commands
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"sleep 0.05 && echo 'Task 1' > task1.txt",
"sleep 0.05 && echo 'Task 2' > task2.txt",
@@ -176,7 +176,7 @@ fn test_bash_shell_integration_post_create_blocks(repo: TestRepo) {
// Pre-approve command
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'Setup done' > setup.txt"]
"#,
)
@@ -244,7 +244,7 @@ fish_bg = "sleep 0.05 && echo 'Fish background done' > fish_bg.txt"
// Pre-approve command
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["sleep 0.05 && echo 'Fish background done' > fish_bg.txt"]
"#,
)
diff --git a/tests/integration_tests/hook_show.rs b/tests/integration_tests/hook_show.rs
index 5e6d49804..b55ba191b 100644
--- a/tests/integration_tests/hook_show.rs
+++ b/tests/integration_tests/hook_show.rs
@@ -113,6 +113,9 @@ deploy = "scripts/deploy.sh"
#[rstest]
fn test_hook_show_approval_status(repo: TestRepo, temp_home: TempDir) {
+ // Remove origin so project_identifier is "repo" (directory name)
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Create user config at XDG path with one approved command
let global_config_dir = temp_home.path().join(".config").join("worktrunk");
fs::create_dir_all(&global_config_dir).unwrap();
@@ -227,6 +230,9 @@ lint = "pre-commit run"
/// Test `wt hook clear` when no approvals exist for the project.
#[rstest]
fn test_hook_clear_no_approvals(repo: TestRepo, temp_home: TempDir) {
+ // Remove origin so project_identifier is "repo" (directory name)
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Create user config without any project approvals
let global_config_dir = temp_home.path().join(".config").join("worktrunk");
fs::create_dir_all(&global_config_dir).unwrap();
@@ -254,6 +260,9 @@ fn test_hook_clear_no_approvals(repo: TestRepo, temp_home: TempDir) {
/// Test `wt hook clear` when project has approvals to clear.
#[rstest]
fn test_hook_clear_with_approvals(repo: TestRepo, temp_home: TempDir) {
+ // Remove origin so project_identifier is "repo" (directory name)
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Create user config with approved commands for this project
let global_config_dir = temp_home.path().join(".config").join("worktrunk");
fs::create_dir_all(&global_config_dir).unwrap();
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index 6467bdacd..0ad18e73d 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -517,8 +517,34 @@ fn test_list_primary_on_different_branch(mut repo: TestRepo) {
assert_cmd_snapshot!(list_snapshots::command(&repo, repo.root_path()));
}
+/// NOTE: This test is used for doc generation (claude-code.md). It removes fixture
+/// worktrees to produce clean output.
+/// TODO: Consider extracting fixture cleanup into a helper function shared with
+/// setup_readme_example_repo.
#[rstest]
fn test_list_with_user_marker(mut repo: TestRepo) {
+ // Remove fixture worktrees for clean doc output (used by claude-code.md)
+ for branch in &["feature-a", "feature-b", "feature-c"] {
+ let worktree_path = repo
+ .root_path()
+ .parent()
+ .unwrap()
+ .join(format!("repo.{}", branch));
+ if worktree_path.exists() {
+ let _ = repo
+ .git_command()
+ .args([
+ "worktree",
+ "remove",
+ "--force",
+ worktree_path.to_str().unwrap(),
+ ])
+ .output();
+ }
+ // Delete the branch after removing the worktree
+ let _ = repo.git_command().args(["branch", "-D", branch]).output();
+ }
+
repo.commit_with_age("Initial commit", DAY);
// Branch ahead of main with commits and user marker 🤖
@@ -691,7 +717,34 @@ fn test_list_user_marker_with_special_characters(mut repo: TestRepo) {
/// - `⎇` branch without worktree
///
/// Returns feature_api_path for running commands from feature-api.
+///
+/// NOTE: This function is used for doc generation. It removes fixture worktrees
+/// to produce clean output for README/docs. If you need the fixture worktrees,
+/// use a different setup function.
fn setup_readme_example_repo(repo: &mut TestRepo) -> std::path::PathBuf {
+ // Remove fixture worktrees to produce clean doc output
+ // These doc tests are used to generate README and website examples
+ for branch in &["feature-a", "feature-b", "feature-c"] {
+ let worktree_path = repo
+ .root_path()
+ .parent()
+ .unwrap()
+ .join(format!("repo.{}", branch));
+ if worktree_path.exists() {
+ let _ = repo
+ .git_command()
+ .args([
+ "worktree",
+ "remove",
+ "--force",
+ worktree_path.to_str().unwrap(),
+ ])
+ .output();
+ }
+ // Delete the branch after removing the worktree
+ let _ = repo.git_command().args(["branch", "-D", branch]).output();
+ }
+
// === Set up main branch with initial codebase ===
// Main has a working API with security issues that fix-auth will harden
std::fs::write(
diff --git a/tests/integration_tests/list_config.rs b/tests/integration_tests/list_config.rs
index e2135da3e..295f7b435 100644
--- a/tests/integration_tests/list_config.rs
+++ b/tests/integration_tests/list_config.rs
@@ -262,6 +262,28 @@ fn test_list_json_no_url_without_template(repo: TestRepo, temp_home: TempDir) {
/// Only worktrees should have URLs - branches without worktrees can't have running dev servers.
#[rstest]
fn test_list_url_with_branches_flag(repo: TestRepo, temp_home: TempDir) {
+ // Remove fixture worktrees and their branches to isolate test (keep only main worktree)
+ for branch in &["feature-a", "feature-b", "feature-c"] {
+ let worktree_path = repo
+ .root_path()
+ .parent()
+ .unwrap()
+ .join(format!("repo.{}", branch));
+ if worktree_path.exists() {
+ let _ = repo
+ .git_command()
+ .args([
+ "worktree",
+ "remove",
+ "--force",
+ worktree_path.to_str().unwrap(),
+ ])
+ .output();
+ }
+ // Delete the branch after removing the worktree
+ let _ = repo.git_command().args(["branch", "-D", branch]).output();
+ }
+
// Create a branch without a worktree
repo.run_git(&["branch", "feature"]);
diff --git a/tests/integration_tests/post_start_commands.rs b/tests/integration_tests/post_start_commands.rs
index 191a65c05..628157dc4 100644
--- a/tests/integration_tests/post_start_commands.rs
+++ b/tests/integration_tests/post_start_commands.rs
@@ -51,7 +51,7 @@ fn test_post_create_single_command(repo: TestRepo) {
// Pre-approve the command by writing to the isolated test config
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'Setup complete'"]
"#,
);
@@ -78,7 +78,7 @@ setup = "echo 'Running setup'"
// Pre-approve both commands in temp HOME
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo 'Installing deps'",
"echo 'Running setup'",
@@ -103,7 +103,7 @@ fn test_post_create_failing_command(repo: TestRepo) {
// Pre-approve the command in temp HOME
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["exit 1"]
"#,
);
@@ -136,7 +136,7 @@ root = "echo 'Root: {{ repo_path }}' >> info.txt"
repo.write_test_config(
r#"worktree-path = "../{{ repo }}.{{ branch | sanitize }}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = [
"echo 'Repo: {{ repo }}' > info.txt",
"echo 'Branch: {{ branch }}' >> info.txt",
@@ -209,7 +209,7 @@ fn test_post_create_default_branch_template(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'Default: {{ default_branch }}' > default.txt"]
"#,
);
@@ -364,7 +364,7 @@ base_path = "echo 'Base Path: {{ base_worktree_path }}' >> base_info.txt"
// Pre-approve the commands
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo 'Base: {{ base }}' > base_info.txt",
"echo 'Base Path: {{ base_worktree_path }}' >> base_info.txt",
@@ -432,7 +432,7 @@ fn test_post_create_json_stdin(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["cat > context.json"]
"#,
);
@@ -531,7 +531,7 @@ setup = "./scripts/setup.py"
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["./scripts/setup.py"]
"#,
);
@@ -598,7 +598,7 @@ fn test_post_start_json_stdin(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["cat > context.json"]
"#,
);
@@ -654,7 +654,7 @@ fn test_post_start_single_background_command(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["sleep 0.1 && echo 'Background task done' > background.txt"]
"#,
);
@@ -691,7 +691,7 @@ task2 = "echo 'Task 2 running' > task2.txt"
// Pre-approve both commands
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo 'Task 1 running' > task1.txt",
"echo 'Task 2 running' > task2.txt",
@@ -727,7 +727,7 @@ server = "sleep 0.05 && echo 'Server running' > server.txt"
// Pre-approve all commands
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo 'Setup done' > setup.txt",
"sleep 0.05 && echo 'Server running' > server.txt",
@@ -773,7 +773,7 @@ fn test_post_start_log_file_captures_output(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'stdout output' && echo 'stderr output' >&2"]
"#,
);
@@ -827,7 +827,7 @@ fn test_post_start_invalid_command_handling(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'unclosed quote"]
"#,
);
@@ -862,7 +862,7 @@ task3 = "echo 'TASK3_OUTPUT'"
// Pre-approve all commands
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo 'TASK1_OUTPUT'",
"echo 'TASK2_OUTPUT'",
@@ -935,7 +935,7 @@ fn test_execute_flag_with_post_start_commands(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'Background task' > background.txt"]
"#,
);
@@ -975,7 +975,7 @@ fn test_post_start_complex_shell_commands(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'line1\nline2\nline3' | grep line2 > filtered.txt"]
"#,
);
@@ -1013,7 +1013,7 @@ echo 'third line' >> multiline.txt
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["""
{}"""]
"#,
@@ -1065,7 +1065,7 @@ fi
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["""
{}"""]
"#,
@@ -1106,7 +1106,7 @@ fn test_post_start_skipped_on_existing_worktree(repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'POST-START-RAN' > post_start_marker.txt"]
"#,
);
diff --git a/tests/integration_tests/remove.rs b/tests/integration_tests/remove.rs
index af0d039a6..0dcec7976 100644
--- a/tests/integration_tests/remove.rs
+++ b/tests/integration_tests/remove.rs
@@ -994,7 +994,7 @@ fn test_pre_remove_hook_executes(mut repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'About to remove worktree'"]
"#,
);
@@ -1025,7 +1025,7 @@ worktree_name = "echo 'Name: {{ worktree_name }}'"
// Pre-approve the commands (templates match what's shown in prompts)
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo 'Branch: {{ branch }}'",
"echo 'Worktree: {{ worktree_path }}'",
@@ -1064,7 +1064,7 @@ fn test_pre_remove_hook_runs_in_background_mode(mut repo: TestRepo) {
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["echo 'hook ran' > {}"]
"#,
marker_file.to_string_lossy().replace('\\', "/")
@@ -1099,7 +1099,7 @@ fn test_pre_remove_hook_failure_aborts(mut repo: TestRepo) {
// Pre-approve the command
repo.write_test_config(
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["exit 1"]
"#,
);
@@ -1138,7 +1138,7 @@ fn test_pre_remove_hook_not_for_branch_only(repo: TestRepo) {
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["echo 'hook ran' > {}"]
"#,
marker_file.to_string_lossy().replace('\\', "/")
@@ -1183,7 +1183,7 @@ fn test_pre_remove_hook_skipped_with_no_verify(mut repo: TestRepo) {
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["echo 'hook ran' > {}"]
"#,
marker_file.to_string_lossy().replace('\\', "/")
@@ -1240,7 +1240,7 @@ fn test_pre_remove_hook_runs_for_detached_head(mut repo: TestRepo) {
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["touch {marker_path}"]
"#,
));
@@ -1281,7 +1281,7 @@ fn test_pre_remove_hook_runs_for_detached_head_background(mut repo: TestRepo) {
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["touch {marker_path}"]
"#,
));
@@ -1331,7 +1331,7 @@ fn test_pre_remove_hook_branch_expansion_detached_head(mut repo: TestRepo) {
repo.write_test_config(&format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["echo 'branch={{{{ branch }}}}' > {branch_path}"]
"#,
));
diff --git a/tests/integration_tests/repository.rs b/tests/integration_tests/repository.rs
index 773ca35a7..73a6e54a6 100644
--- a/tests/integration_tests/repository.rs
+++ b/tests/integration_tests/repository.rs
@@ -289,7 +289,8 @@ fn test_project_identifier_ssh_protocol_with_port() {
#[test]
fn test_project_identifier_no_remote_fallback() {
let repo = TestRepo::new();
- // Don't create a remote - should fall back to directory name
+ // Remove origin (fixture has it) for this no-remote test
+ repo.run_git(&["remote", "remove", "origin"]);
let repository = Repository::at(repo.root_path().to_path_buf()).unwrap();
let id = repository.project_identifier().unwrap();
diff --git a/tests/integration_tests/select.rs b/tests/integration_tests/select.rs
index ddf73e13b..0eecc1a7c 100644
--- a/tests/integration_tests/select.rs
+++ b/tests/integration_tests/select.rs
@@ -326,7 +326,11 @@ fn normalize_output(output: &str) -> String {
}
#[rstest]
-fn test_select_abort_with_escape(repo: TestRepo) {
+fn test_select_abort_with_escape(mut repo: TestRepo) {
+ repo.remove_fixture_worktrees();
+ // Remove origin so snapshots don't show origin/main
+ repo.run_git(&["remote", "remove", "origin"]);
+
let env_vars = repo.test_env_vars();
let (raw_output, exit_code) = exec_in_pty_with_input(
get_cargo_bin("wt").to_str().unwrap(),
@@ -345,6 +349,10 @@ fn test_select_abort_with_escape(repo: TestRepo) {
#[rstest]
fn test_select_with_multiple_worktrees(mut repo: TestRepo) {
+ repo.remove_fixture_worktrees();
+ // Remove origin so snapshots don't show origin/main
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.add_worktree("feature-one");
repo.add_worktree("feature-two");
@@ -366,6 +374,10 @@ fn test_select_with_multiple_worktrees(mut repo: TestRepo) {
#[rstest]
fn test_select_with_branches(mut repo: TestRepo) {
+ repo.remove_fixture_worktrees();
+ // Remove origin so snapshots don't show origin/main
+ repo.run_git(&["remote", "remove", "origin"]);
+
repo.add_worktree("active-worktree");
// Create a branch without a worktree
let output = repo
@@ -393,6 +405,10 @@ fn test_select_with_branches(mut repo: TestRepo) {
#[rstest]
fn test_select_preview_panel_uncommitted(mut repo: TestRepo) {
+ repo.remove_fixture_worktrees();
+ // Remove origin so snapshots don't show origin/main
+ repo.run_git(&["remote", "remove", "origin"]);
+
let feature_path = repo.add_worktree("feature");
// First, create and commit a file so we have something to modify
@@ -447,6 +463,10 @@ fn test_select_preview_panel_uncommitted(mut repo: TestRepo) {
#[rstest]
fn test_select_preview_panel_log(mut repo: TestRepo) {
+ repo.remove_fixture_worktrees();
+ // Remove origin so snapshots don't show origin/main
+ repo.run_git(&["remote", "remove", "origin"]);
+
let feature_path = repo.add_worktree("feature");
// Make several commits in the feature worktree
@@ -500,6 +520,10 @@ fn test_select_preview_panel_log(mut repo: TestRepo) {
#[rstest]
fn test_select_preview_panel_main_diff(mut repo: TestRepo) {
+ repo.remove_fixture_worktrees();
+ // Remove origin so snapshots don't show origin/main
+ repo.run_git(&["remote", "remove", "origin"]);
+
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 db3024bc1..c12b22a00 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -764,6 +764,9 @@ mod tests {
#[case("zsh")]
#[case("fish")]
fn test_wrapper_step_for_each(#[case] shell: &str, mut repo: TestRepo) {
+ // Remove fixture worktrees so we can create our own feature-a and feature-b
+ repo.remove_fixture_worktrees();
+
repo.commit("Initial commit");
// Create additional worktrees
@@ -945,7 +948,7 @@ watch = "echo 'Watching for file changes'"
// Pre-approve the commands in user config
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo 'Installing dependencies...'",
"echo 'Building project...'",
@@ -992,7 +995,7 @@ test = "echo '✓ All 47 tests passed in 2.3s'"
// Pre-approve commands
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo '✓ Code formatting check passed'",
"echo '✓ Linting passed - no warnings'",
@@ -1048,7 +1051,7 @@ test = "echo '✗ Test suite failed: 3 tests failing' && exit 1"
// Pre-approve the commands
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = [
"echo '✓ Code formatting check passed'",
"echo '✗ Test suite failed: 3 tests failing' && exit 1",
@@ -1116,7 +1119,7 @@ check2 = "{} check2 3"
format!(
r#"worktree-path = "../{{{{ repo }}}}.{{{{ branch }}}}"
-[projects."repo"]
+[projects."../origin"]
approved-commands = [
"{} check1 3",
"{} check2 3",
@@ -1166,7 +1169,7 @@ approved-commands = [
// Pre-approve the command in user config
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'test command executed'"]
"#,
)
@@ -1309,7 +1312,7 @@ approved-commands = ["echo 'test command executed'"]
// Pre-approve the command in user config
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'background task'"]
"#,
)
@@ -1357,7 +1360,7 @@ approved-commands = ["echo 'background task'"]
// Pre-approve the command in user config
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'fish background task'"]
"#,
)
@@ -1571,7 +1574,7 @@ approved-commands = ["echo 'fish background task'"]
// Pre-approve the command
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'background job'"]
"#,
)
@@ -1621,7 +1624,7 @@ approved-commands = ["echo 'background job'"]
// Pre-approve the command
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'bash background'"]
"#,
)
@@ -2119,7 +2122,7 @@ approved-commands = ["echo 'bash background'"]
// Pre-approve the command
fs::write(
repo.test_config_path(),
- r#"[projects."repo"]
+ r#"[projects."../origin"]
approved-commands = ["echo 'cleanup test'"]
"#,
)
@@ -2461,6 +2464,9 @@ fi
use portable_pty::CommandBuilder;
use std::io::{Read, Write};
+ // Remove origin so worktrunk uses directory name as project identifier
+ repo.run_git(&["remote", "remove", "origin"]);
+
// Create project config with named post-create commands
repo.write_project_config(
r#"[post-create]
diff --git a/tests/integration_tests/statusline.rs b/tests/integration_tests/statusline.rs
index 66fd0fed5..cedfb0b7b 100644
--- a/tests/integration_tests/statusline.rs
+++ b/tests/integration_tests/statusline.rs
@@ -102,14 +102,14 @@ fn add_commits_ahead(repo: &mut TestRepo) {
#[rstest]
fn test_statusline_basic(repo: TestRepo) {
let output = run_statusline(&repo, &[], None);
- assert_snapshot!(output, @" main ^");
+ assert_snapshot!(output, @" main ^|");
}
#[rstest]
fn test_statusline_with_changes(repo: TestRepo) {
add_uncommitted_changes(&repo);
let output = run_statusline(&repo, &[], None);
- assert_snapshot!(output, @" main ?^");
+ assert_snapshot!(output, @" main ?^|");
}
#[rstest]
@@ -170,7 +170,7 @@ fn test_statusline_claude_code_full_context(repo: TestRepo) {
let output = run_statusline(&repo, &["--claude-code"], Some(&json));
claude_code_snapshot_settings().bind(|| {
- assert_snapshot!(output, @"[PATH] main ?^ | Opus");
+ assert_snapshot!(output, @"[PATH] main ?^| | Opus");
});
}
@@ -181,7 +181,7 @@ fn test_statusline_claude_code_minimal(repo: TestRepo) {
let output = run_statusline(&repo, &["--claude-code"], Some(&json));
claude_code_snapshot_settings().bind(|| {
- assert_snapshot!(output, @"[PATH] main ^");
+ assert_snapshot!(output, @"[PATH] main ^|");
});
}
@@ -197,7 +197,7 @@ fn test_statusline_claude_code_with_model(repo: TestRepo) {
let output = run_statusline(&repo, &["--claude-code"], Some(&json));
claude_code_snapshot_settings().bind(|| {
- assert_snapshot!(output, @"[PATH] main ^ | Haiku");
+ assert_snapshot!(output, @"[PATH] main ^| | Haiku");
});
}
@@ -288,7 +288,7 @@ url = "http://{{ branch }}.localhost:3000"
let output = run_statusline(&repo, &[], None);
// Shows `?` because writing project config creates uncommitted file
- assert_snapshot!(output, @" main ?^ http://main.localhost:3000");
+ assert_snapshot!(output, @" main ?^| http://main.localhost:3000");
}
#[rstest]
diff --git a/tests/integration_tests/switch.rs b/tests/integration_tests/switch.rs
index d5ec9ee93..43e1ebce5 100644
--- a/tests/integration_tests/switch.rs
+++ b/tests/integration_tests/switch.rs
@@ -586,11 +586,11 @@ fn test_switch_previous_branch_no_history(repo: TestRepo) {
#[rstest]
fn test_switch_main_branch(repo: TestRepo) {
- // Create a feature branch
- repo.run_git(&["branch", "feature-a"]);
+ // Create a feature branch (use unique name to avoid fixture conflicts)
+ repo.run_git(&["branch", "test-feat-x"]);
- // Switch to feature-a first
- snapshot_switch("switch_main_branch_to_feature", &repo, &["feature-a"]);
+ // Switch to test-feat-x first
+ snapshot_switch("switch_main_branch_to_feature", &repo, &["test-feat-x"]);
// Now wt switch ^ should resolve to main
snapshot_switch("switch_main_branch", &repo, &["^"]);
@@ -848,50 +848,50 @@ fn test_switch_previous_with_stale_history(repo: TestRepo) {
/// changes the working directory before the next command runs.
#[rstest]
fn test_switch_ping_pong_realistic(repo: TestRepo) {
- // Create feature-a branch
- repo.run_git(&["branch", "feature-a"]);
+ // Create ping-pong branch (unique name to avoid fixture conflicts)
+ repo.run_git(&["branch", "ping-pong"]);
- // Step 1: From main worktree, switch to feature-a (creates worktree)
- // History: current=feature-a, previous=main
+ // Step 1: From main worktree, switch to ping-pong (creates worktree)
+ // History: current=ping-pong, previous=main
snapshot_switch_from_dir(
- "ping_pong_1_main_to_feature_a",
+ "ping_pong_1_main_to_feature",
&repo,
- &["feature-a"],
+ &["ping-pong"],
repo.root_path(),
);
- // Calculate feature-a worktree path
- let feature_a_path = repo.root_path().parent().unwrap().join(format!(
- "{}.feature-a",
+ // Calculate ping-pong worktree path
+ let ping_pong_path = repo.root_path().parent().unwrap().join(format!(
+ "{}.ping-pong",
repo.root_path().file_name().unwrap().to_str().unwrap()
));
- // Step 2: From feature-a worktree, switch back to main
- // History: current=main, previous=feature-a
+ // Step 2: From ping-pong worktree, switch back to main
+ // History: current=main, previous=ping-pong
snapshot_switch_from_dir(
- "ping_pong_2_feature_a_to_main",
+ "ping_pong_2_feature_to_main",
&repo,
&["main"],
- &feature_a_path,
+ &ping_pong_path,
);
- // Step 3: From main worktree, wt switch - should go to feature-a
- // History: current=feature-a, previous=main
+ // Step 3: From main worktree, wt switch - should go to ping-pong
+ // History: current=ping-pong, previous=main
snapshot_switch_from_dir(
- "ping_pong_3_dash_to_feature_a",
+ "ping_pong_3_dash_to_feature",
&repo,
&["-"],
repo.root_path(),
);
- // Step 4: From feature-a worktree, wt switch - should go back to main
- // History: current=main, previous=feature-a
- snapshot_switch_from_dir("ping_pong_4_dash_to_main", &repo, &["-"], &feature_a_path);
+ // Step 4: From ping-pong worktree, wt switch - should go back to main
+ // History: current=main, previous=ping-pong
+ snapshot_switch_from_dir("ping_pong_4_dash_to_main", &repo, &["-"], &ping_pong_path);
- // Step 5: From main worktree, wt switch - should go to feature-a again (ping-pong!)
- // History: current=feature-a, previous=main
+ // Step 5: From main worktree, wt switch - should go to ping-pong again (ping-pong!)
+ // History: current=ping-pong, previous=main
snapshot_switch_from_dir(
- "ping_pong_5_dash_to_feature_a_again",
+ "ping_pong_5_dash_to_feature_again",
&repo,
&["-"],
repo.root_path(),
diff --git a/tests/integration_tests/user_hooks.rs b/tests/integration_tests/user_hooks.rs
index 4fd4df15d..78b3766a2 100644
--- a/tests/integration_tests/user_hooks.rs
+++ b/tests/integration_tests/user_hooks.rs
@@ -71,7 +71,7 @@ fn test_user_hooks_run_before_project_hooks(repo: TestRepo) {
r#"[post-create]
log = "echo 'USER_HOOK' >> hook_order.txt"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["echo 'PROJECT_HOOK' >> hook_order.txt"]
"#,
);
@@ -123,7 +123,7 @@ fn test_no_verify_flag_skips_all_hooks(repo: TestRepo) {
r#"[post-create]
log = "echo 'USER_HOOK' > user_marker.txt"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["echo 'PROJECT_HOOK' > project_marker.txt"]
"#,
);
@@ -675,7 +675,7 @@ fn test_user_and_project_post_start_both_run(repo: TestRepo) {
r#"[post-start]
bg = "echo 'USER_POST_START' > user_bg.txt"
-[projects."repo"]
+[projects."../origin"]
approved-commands = ["echo 'PROJECT_POST_START' > project_bg.txt"]
"#,
);
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
index 6e0b37342..123be3a1a 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -32,7 +33,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 1 command:
+▲ origin needs approval to execute 1 command:
○ post-create:
  echo 'test command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index 2eebc6e41..0fe04a921 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 4 commands:
+▲ origin needs approval to execute 4 commands:
○ post-create branch:
  echo 'Branch: {{ branch }}'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index 27e8b6e6e..4820d1dd7 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 3 commands:
+▲ origin needs approval to execute 3 commands:
○ post-create install:
  echo 'Installing dependencies...'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index 7cf72d69e..e377061df 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 1 command:
+▲ origin needs approval to execute 1 command:
○ post-create:
  echo 'Worktree path: {{ worktree_path }}'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap
index 40254833b..7e0924acc 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 2 commands:
+▲ origin needs approval to execute 2 commands:
○ pre-merge test:
  echo 'Running project test'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap
index f76713b12..f1c6660b0 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 1 command:
+▲ origin needs approval to execute 1 command:
○ pre-merge test:
  echo 'Running project test'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
index 28f5d6682..9889050ec 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 1 command:
+▲ origin needs approval to execute 1 command:
○ post-merge:
  echo 'Post-merge cleanup for {{ branch }}'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
index 0409cfa83..cdb3766fd 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 1 command:
+▲ origin needs approval to execute 1 command:
○ pre-merge:
  echo 'Running pre-merge checks on {{ branch }}'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_second_run.snap
index 21f960ed8..0b9c27076 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_second_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_second_run.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 1 command:
+▲ origin needs approval to execute 1 command:
○ post-create:
  echo 'test command' > output.txt
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_already_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_already_approved.snap
index a06ead581..57aaa1fb7 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_already_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_already_approved.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -32,7 +33,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 1 command:
+▲ origin needs approval to execute 1 command:
○ post-create:
  echo 'test'
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
index 88e8cfbaa..0db25fff5 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
@@ -10,7 +10,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -23,6 +23,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -33,7 +34,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-▲ repo needs approval to execute 1 command:
+▲ origin needs approval to execute 1 command:
○ post-create:
  echo 'test'
diff --git a/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap b/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
index c65341cd0..15df0e398 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
index 684aae466..fc3c1a04e 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
index 3f2d71fc5..5fb2de0c4 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
index c65341cd0..15df0e398 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
index d39d0ba52..7dab48d58 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
index 90e3ba27b..fba853a8b 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature _ ../repo.feature a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature _ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
index 90e3ba27b..fba853a8b 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature _ ../repo.feature a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature _ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
index 3c113b4cc..15df0e398 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
index e6f787e38..fc3c1a04e 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
index 42b69c65c..5fb2de0c4 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
index 3c113b4cc..15df0e398 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
index 7bd71ce9c..7dab48d58 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
index 7bd71ce9c..7dab48d58 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
index be58d94e1..79dc113f2 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
index ae0154b3e..293ff1bcd 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature ↑ ↑1 +1 ../repo.feature ● 1b2eaadd 1d Local commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
++ feature ↑ ↑1 +1 ../repo.feature ● da7d235a 1d Local commit
-○ Showing 2 worktrees, 1 ahead
+○ Showing 5 worktrees, 4 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
index c29c9af3e..fba853a8b 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature _ ../repo.feature a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature _ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_platform_override.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_platform_override.snap
index 788691607..02923c73a 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_platform_override.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_platform_override.snap
@@ -30,12 +30,18 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ? ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ? ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees, 1 with changes
+○ Showing 5 worktrees, 1 with changes, 3 ahead
----- stderr -----
[W] Invalid CI platform in config: 'invalid_platform'. Expected 'github' or 'gitlab'.
[W] Invalid CI platform in config: 'invalid_platform'. Expected 'github' or 'gitlab'.
+[W] Invalid CI platform in config: 'invalid_platform'. Expected 'github' or 'gitlab'.
+[W] Invalid CI platform in config: 'invalid_platform'. Expected 'github' or 'gitlab'.
+[W] Invalid CI platform in config: 'invalid_platform'. Expected 'github' or 'gitlab'.
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_platform_override_github.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_platform_override_github.snap
index f4c30bda9..c5df101cc 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_platform_override_github.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_platform_override_github.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ? ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ? ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees, 1 with changes
+○ Showing 5 worktrees, 1 with changes, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap b/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
index d39d0ba52..7dab48d58 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap b/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
index c616e5921..79dc113f2 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap b/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
index 6bed7df1a..293ff1bcd 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature ↑ ↑1 +1 ../repo.feature ● 1b2eaadd 1d Local commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
++ feature ↑ ↑1 +1 ../repo.feature ● da7d235a 1d Local commit
-○ Showing 2 worktrees, 1 ahead
+○ Showing 5 worktrees, 4 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap b/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
index 3f2d71fc5..5fb2de0c4 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap b/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
index d39d0ba52..7dab48d58 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . ● a1e809f5 1d Initial commit
-+ feature _ ../repo.feature ● a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| . | ● 05a4a45d 16h Initial commit
++ feature _ ../repo.feature ● 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a ● 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b ● f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c ● 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_config_deleted_shows_regenerate_hint.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_config_deleted_shows_regenerate_hint.snap
index 149eec338..e45770f37 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_config_deleted_shows_regenerate_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_config_deleted_shows_regenerate_hint.snap
@@ -29,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ? ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ? ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree, 1 with changes
+○ Showing 4 worktrees, 1 with changes, 3 ahead
----- stderr -----
▲ Project config uses deprecated template variables: main_worktree → repo
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
index 736c7247e..9365696db 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
▲ User config uses deprecated template variables: repo_root → repo_path, worktree → worktree_path, main_worktree → repo
diff --git a/tests/snapshots/integration__integration_tests__diagnostic__diagnostic_file_format.snap b/tests/snapshots/integration__integration_tests__diagnostic__diagnostic_file_format.snap
index 8f07ae6d1..0884daacd 100644
--- a/tests/snapshots/integration__integration_tests__diagnostic__diagnostic_file_format.snap
+++ b/tests/snapshots/integration__integration_tests__diagnostic__diagnostic_file_format.snap
@@ -28,6 +28,18 @@ branch refs/heads/main
worktree [PATH]
HEAD [COMMIT]
+
+worktree [PATH]
+HEAD [COMMIT]
+branch refs/heads/feature-a
+
+worktree [PATH]
+HEAD [COMMIT]
+branch refs/heads/feature-b
+
+worktree [PATH]
+HEAD [COMMIT]
+branch refs/heads/feature-c
```
</details>
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_command_fails_in_one.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_command_fails_in_one.snap
index 0ca820fa6..5cd4060ba 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_command_fails_in_one.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_command_fails_in_one.snap
@@ -12,7 +12,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -25,6 +25,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -45,7 +46,25 @@ fatal: ambiguous argument 'nonexistent-ref': unknown revision or path not in the
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
✗ Failed in feature (exit code 128)
+◎ Running in feature-a...
+fatal: ambiguous argument 'nonexistent-ref': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+✗ Failed in feature-a (exit code 128)
+◎ Running in feature-b...
+fatal: ambiguous argument 'nonexistent-ref': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+✗ Failed in feature-b (exit code 128)
+◎ Running in feature-c...
+fatal: ambiguous argument 'nonexistent-ref': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+✗ Failed in feature-c (exit code 128)
-▲ 2 of 2 worktrees failed
+▲ 5 of 5 worktrees failed
  main
  feature
+  feature-a
+  feature-b
+  feature-c
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_detached_branch_variable.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_detached_branch_variable.snap
index c1974c2cc..8d96564a2 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_detached_branch_variable.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_detached_branch_variable.snap
@@ -11,7 +11,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -24,6 +24,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -38,5 +39,11 @@ exit_code: 0
Branch: main
◎ Running in repo.detached-test (detached)...
Branch: HEAD
+◎ Running in feature-a...
+Branch: feature-a
+◎ Running in feature-b...
+Branch: feature-b
+◎ Running in feature-c...
+Branch: feature-c
-✓ Completed in 2 worktrees
+✓ Completed in 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_multiple_worktrees.snap
index 2f721a667..412402576 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_multiple_worktrees.snap
@@ -12,7 +12,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -25,6 +25,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -41,5 +42,7 @@ main
feature-a
◎ Running in feature-b...
feature-b
+◎ Running in feature-c...
+feature-c
-✓ Completed in 3 worktrees
+✓ Completed in 4 worktrees
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 da6bf2b04..e0e17c71e 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
@@ -12,7 +12,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -25,6 +25,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -36,5 +37,12 @@ exit_code: 0
----- stderr -----
◎ Running in main...
+warning: untracked cache is disabled on this system or location
+◎ Running in feature-a...
+warning: untracked cache is disabled on this system or location
+◎ Running in feature-b...
+warning: untracked cache is disabled on this system or location
+◎ Running in feature-c...
+warning: untracked cache is disabled on this system or location
-✓ Completed in 1 worktree
+✓ Completed in 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_skips_prunable_worktrees.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_skips_prunable_worktrees.snap
index 182af096f..f0ff06c64 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_skips_prunable_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_skips_prunable_worktrees.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/for_each.rs
-assertion_line: 115
info:
program: wt
args:
@@ -12,7 +11,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -38,5 +37,11 @@ exit_code: 0
----- stderr -----
◎ Running in main...
Running in main
+◎ Running in feature-a...
+Running in feature-a
+◎ Running in feature-b...
+Running in feature-b
+◎ Running in feature-c...
+Running in feature-c
-✓ Completed in 1 worktree
+✓ Completed in 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_spawn_fails.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_spawn_fails.snap
index 3aa4a3556..36b18f219 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_spawn_fails.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_spawn_fails.snap
@@ -11,7 +11,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -24,6 +24,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -40,7 +41,19 @@ sh: nonexistent-command-12345: command not found
◎ Running in feature...
sh: nonexistent-command-12345: command not found
✗ Failed in feature (exit code 127)
+◎ Running in feature-a...
+sh: nonexistent-command-12345: command not found
+✗ Failed in feature-a (exit code 127)
+◎ Running in feature-b...
+sh: nonexistent-command-12345: command not found
+✗ Failed in feature-b (exit code 127)
+◎ Running in feature-c...
+sh: nonexistent-command-12345: command not found
+✗ Failed in feature-c (exit code 127)
-▲ 2 of 2 worktrees failed
+▲ 5 of 5 worktrees failed
  main
  feature
+  feature-a
+  feature-b
+  feature-c
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached_head.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached_head.snap
index 8f9f5e970..c280a8b54 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached_head.snap
@@ -12,7 +12,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -25,6 +25,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -36,6 +37,13 @@ exit_code: 0
----- stderr -----
◎ Running in main...
+warning: untracked cache is disabled on this system or location
◎ Running in repo.detached-test (detached)...
+◎ Running in feature-a...
+warning: untracked cache is disabled on this system or location
+◎ Running in feature-b...
+warning: untracked cache is disabled on this system or location
+◎ Running in feature-c...
+warning: untracked cache is disabled on this system or location
-✓ Completed in 2 worktrees
+✓ Completed in 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_with_template.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_with_template.snap
index 984094dd5..6092e0b3f 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_with_template.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_with_template.snap
@@ -11,7 +11,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -24,6 +24,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -36,5 +37,11 @@ exit_code: 0
----- stderr -----
◎ Running in main...
Branch: main
+◎ Running in feature-a...
+Branch: feature-a
+◎ Running in feature-b...
+Branch: feature-b
+◎ Running in feature-c...
+Branch: feature-c
-✓ Completed in 1 worktree
+✓ Completed in 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
index 73dbb2420..c84a40da4 100644
--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
diff --git a/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap b/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
index 0767ac7d4..8a9e28026 100644
--- a/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . f31b5717 1d Main changes shared.txt
-+ feature ✗ ↑1 ↓1 +1 -1 ../repo.feature 70300b03 1d Feature changes shared.txt
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ . ⇡2 1edd043e 1d Main changes shared.txt
++ feature-a ↕ ↑1 ↓2 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature ✗ ↑1 ↓1 +1 -1 ../repo.feature dee7183a 1d Feature changes shared.txt
-○ Showing 2 worktrees, 1 ahead
+○ Showing 5 worktrees, 4 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap b/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
index eca8f4b8c..f6c67d3aa 100644
--- a/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . f31b5717 1d Main changes shared.txt
-+ feature ✗ ↑1 ↓1 ../repo.feature 70300b03 1d Feature changes shared.txt
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^⇡ . ⇡2 1edd043e 1d Main changes shared.txt
++ feature-a ↕ ↑1 ↓2 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature ✗ ↑1 ↓1 ../repo.feature dee7183a 1d Feature changes shared.txt
-○ Showing 2 worktrees, 1 ahead
+○ Showing 5 worktrees, 4 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
index 178c71136..7b14d8471 100644
--- a/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
- branch-only /_ a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ branch-only /_ 05a4a45d 16h Initial commit
-○ Showing 1 worktrees, 1 branches
+○ Showing 4 worktrees, 1 branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_detached_head.snap b/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
index 62c17793a..705aabe1d 100644
--- a/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ⚑^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ - ⚑^ . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
index 547963666..5b4f7e91a 100644
--- a/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ - ⚑_ ../repo.feature a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ - ⚑_ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
index 45009fe23..1c0103331 100644
--- a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ⋯ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ⋯ . | 05a4a45d 16h Initial commit
++ feature-a ⋯ ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ⋯ ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ⋯ ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees
----- stderr -----
▲ Configured default branch nonexistent does not exist locally
diff --git a/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap b/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
index 77095678d..9514d23d7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
@@ -30,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
- assets /∅ 50209039 1d Add asset
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ assets /∅ 50209039 1d Add asset
-○ Showing 1 worktrees, 1 branches
+○ Showing 4 worktrees, 1 branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap
index ef5921df0..a9def5c9f 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap
@@ -36,8 +36,8 @@ exit_code: 0
"path": "_REPO_",
"kind": "worktree",
"commit": {
- "sha": "33c3e5aa9f928d3eab87da8cbcd187e2ab921064",
- "short_sha": "33c3e5a",
+ "sha": "652da662bf0dd2bb559f29afa4d12ec2fffe46fe",
+ "short_sha": "652da66",
"message": "Same content on main",
"timestamp": 1735689600
},
@@ -53,22 +53,133 @@ exit_code: 0
}
},
"main_state": "is_main",
+ "remote": {
+ "name": "origin",
+ "branch": "main",
+ "ahead": 1,
+ "behind": 0
+ },
"worktree": {
"detached": false
},
"is_main": true,
"is_current": true,
"is_previous": false,
- "statusline": "main /u001b[2m^/u001b[22m",
- "symbols": "^"
+ "statusline": "main /u001b[2m^/u001b[22m/u001b[2m⇡/u001b[22m /u001b[32m⇡1/u001b[0m",
+ "symbols": "^⇡"
+ },
+ {
+ "branch": "feature-a",
+ "path": "_REPO_.feature-a",
+ "kind": "worktree",
+ "commit": {
+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",
+ "short_sha": "1b87d47",
+ "message": "Add feature-a file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 1
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-a /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓1/u001b[0m",
+ "symbols": "↕"
+ },
+ {
+ "branch": "feature-b",
+ "path": "_REPO_.feature-b",
+ "kind": "worktree",
+ "commit": {
+ "sha": "f62940fcec424585adf98625e722fdf990810614",
+ "short_sha": "f62940f",
+ "message": "Add feature-b file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 1
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-b /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓1/u001b[0m",
+ "symbols": "↕"
+ },
+ {
+ "branch": "feature-c",
+ "path": "_REPO_.feature-c",
+ "kind": "worktree",
+ "commit": {
+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",
+ "short_sha": "345c7c9",
+ "message": "Add feature-c file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 1
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-c /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓1/u001b[0m",
+ "symbols": "↕"
},
{
"branch": "feature-merged",
"path": "_REPO_.feature-merged",
"kind": "worktree",
"commit": {
- "sha": "ee45656141f6f30e6e036767adf380b3ccc639d7",
- "short_sha": "ee45656",
+ "sha": "a5d5aefdd9141e87eb33f70dfaddba421d22d0bd",
+ "short_sha": "a5d5aef",
"message": "Merge main into feature",
"timestamp": 1735689600
},
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap
index d8b7bdd2d..46268cc5f 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap
@@ -36,8 +36,8 @@ exit_code: 0
"path": "_REPO_",
"kind": "worktree",
"commit": {
- "sha": "4803e9416c19681b83017135ac3a8c1b04898868",
- "short_sha": "4803e94",
+ "sha": "e52e0f4263b6ea30cadae914ebde3d46431b69ca",
+ "short_sha": "e52e0f4",
"message": "Main commit 2",
"timestamp": 1735689600
},
@@ -53,22 +53,133 @@ exit_code: 0
}
},
"main_state": "is_main",
+ "remote": {
+ "name": "origin",
+ "branch": "main",
+ "ahead": 3,
+ "behind": 0
+ },
"worktree": {
"detached": false
},
"is_main": true,
"is_current": true,
"is_previous": false,
- "statusline": "main /u001b[2m^/u001b[22m",
- "symbols": "^"
+ "statusline": "main /u001b[2m^/u001b[22m/u001b[2m⇡/u001b[22m /u001b[32m⇡3/u001b[0m",
+ "symbols": "^⇡"
+ },
+ {
+ "branch": "feature-a",
+ "path": "_REPO_.feature-a",
+ "kind": "worktree",
+ "commit": {
+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",
+ "short_sha": "1b87d47",
+ "message": "Add feature-a file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 3
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-a /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓3/u001b[0m",
+ "symbols": "↕"
+ },
+ {
+ "branch": "feature-b",
+ "path": "_REPO_.feature-b",
+ "kind": "worktree",
+ "commit": {
+ "sha": "f62940fcec424585adf98625e722fdf990810614",
+ "short_sha": "f62940f",
+ "message": "Add feature-b file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 3
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-b /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓3/u001b[0m",
+ "symbols": "↕"
+ },
+ {
+ "branch": "feature-c",
+ "path": "_REPO_.feature-c",
+ "kind": "worktree",
+ "commit": {
+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",
+ "short_sha": "345c7c9",
+ "message": "Add feature-c file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 3
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-c /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓3/u001b[0m",
+ "symbols": "↕"
},
{
"branch": "feature-ahead",
"path": "_REPO_.feature-ahead",
"kind": "worktree",
"commit": {
- "sha": "1080181c245695ed0d64aba6b0b0b7c0bfff9530",
- "short_sha": "1080181",
+ "sha": "e0c9ce16d24b8c17f0c763f73816037180c89d7f",
+ "short_sha": "e0c9ce1",
"message": "Feature commit 2",
"timestamp": 1735689600
},
@@ -102,8 +213,8 @@ exit_code: 0
"path": "_REPO_.feature-behind",
"kind": "worktree",
"commit": {
- "sha": "b8b9f4453f95a585105de3ae3439d8017dee67f3",
- "short_sha": "b8b9f44",
+ "sha": "01cab36ce221a5ff5c7a6cf60cea6bab3c6315d7",
+ "short_sha": "01cab36",
"message": "Initial commit on main",
"timestamp": 1735689600
},
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap
index a1e67a36c..e55a40c51 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap
@@ -36,8 +36,8 @@ exit_code: 0
"path": "_REPO_",
"kind": "worktree",
"commit": {
- "sha": "33244e69fc0c568ce7cffd49b04c9c89ffb22510",
- "short_sha": "33244e6",
+ "sha": "c6dc8c756334d089aa446e014cb1d2fda29eb129",
+ "short_sha": "c6dc8c7",
"message": "Main conflicting changes",
"timestamp": 1735689600
},
@@ -53,22 +53,133 @@ exit_code: 0
}
},
"main_state": "is_main",
+ "remote": {
+ "name": "origin",
+ "branch": "main",
+ "ahead": 2,
+ "behind": 0
+ },
"worktree": {
"detached": false
},
"is_main": true,
"is_current": true,
"is_previous": false,
- "statusline": "main /u001b[2m^/u001b[22m",
- "symbols": "^"
+ "statusline": "main /u001b[2m^/u001b[22m/u001b[2m⇡/u001b[22m /u001b[32m⇡2/u001b[0m",
+ "symbols": "^⇡"
+ },
+ {
+ "branch": "feature-a",
+ "path": "_REPO_.feature-a",
+ "kind": "worktree",
+ "commit": {
+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",
+ "short_sha": "1b87d47",
+ "message": "Add feature-a file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 2
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-a /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
+ "symbols": "↕"
+ },
+ {
+ "branch": "feature-b",
+ "path": "_REPO_.feature-b",
+ "kind": "worktree",
+ "commit": {
+ "sha": "f62940fcec424585adf98625e722fdf990810614",
+ "short_sha": "f62940f",
+ "message": "Add feature-b file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 2
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-b /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
+ "symbols": "↕"
+ },
+ {
+ "branch": "feature-c",
+ "path": "_REPO_.feature-c",
+ "kind": "worktree",
+ "commit": {
+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",
+ "short_sha": "345c7c9",
+ "message": "Add feature-c file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 2
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-c /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
+ "symbols": "↕"
},
{
"branch": "feature",
"path": "_REPO_.feature",
"kind": "worktree",
"commit": {
- "sha": "33244e69fc0c568ce7cffd49b04c9c89ffb22510",
- "short_sha": "33244e6",
+ "sha": "c6dc8c756334d089aa446e014cb1d2fda29eb129",
+ "short_sha": "c6dc8c7",
"message": "Main conflicting changes",
"timestamp": 1735689600
},
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap
index 1afe4d0fe..4a4150d07 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap
@@ -36,10 +36,10 @@ exit_code: 0
"path": "_REPO_",
"kind": "worktree",
"commit": {
- "sha": "a1e809f511b21ee516412a4520497f0cea4af366",
- "short_sha": "a1e809f",
+ "sha": "05a4a45d0b981dad5c27db59dca482836d59f89e",
+ "short_sha": "05a4a45",
"message": "Initial commit",
- "timestamp": 1735689600
+ "timestamp": 1735718400
},
"working_tree": {
"staged": false,
@@ -53,24 +53,135 @@ exit_code: 0
}
},
"main_state": "is_main",
+ "remote": {
+ "name": "origin",
+ "branch": "main",
+ "ahead": 0,
+ "behind": 0
+ },
"worktree": {
"detached": false
},
"is_main": true,
"is_current": true,
"is_previous": false,
- "statusline": "main /u001b[2m^/u001b[22m",
- "symbols": "^"
+ "statusline": "main /u001b[2m^/u001b[22m/u001b[2m|/u001b[22m",
+ "symbols": "^|"
+ },
+ {
+ "branch": "feature-a",
+ "path": "_REPO_.feature-a",
+ "kind": "worktree",
+ "commit": {
+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",
+ "short_sha": "1b87d47",
+ "message": "Add feature-a file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "ahead",
+ "main": {
+ "ahead": 1,
+ "behind": 0
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-a /u001b[2m↑/u001b[22m /u001b[32m↑1/u001b[0m",
+ "symbols": "↑"
+ },
+ {
+ "branch": "feature-b",
+ "path": "_REPO_.feature-b",
+ "kind": "worktree",
+ "commit": {
+ "sha": "f62940fcec424585adf98625e722fdf990810614",
+ "short_sha": "f62940f",
+ "message": "Add feature-b file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "ahead",
+ "main": {
+ "ahead": 1,
+ "behind": 0
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-b /u001b[2m↑/u001b[22m /u001b[32m↑1/u001b[0m",
+ "symbols": "↑"
+ },
+ {
+ "branch": "feature-c",
+ "path": "_REPO_.feature-c",
+ "kind": "worktree",
+ "commit": {
+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",
+ "short_sha": "345c7c9",
+ "message": "Add feature-c file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "ahead",
+ "main": {
+ "ahead": 1,
+ "behind": 0
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-c /u001b[2m↑/u001b[22m /u001b[32m↑1/u001b[0m",
+ "symbols": "↑"
},
{
"branch": "feature-detached",
"path": "_REPO_.feature-detached",
"kind": "worktree",
"commit": {
- "sha": "a1e809f511b21ee516412a4520497f0cea4af366",
- "short_sha": "a1e809f",
+ "sha": "05a4a45d0b981dad5c27db59dca482836d59f89e",
+ "short_sha": "05a4a45",
"message": "Initial commit",
- "timestamp": 1735689600
+ "timestamp": 1735718400
},
"working_tree": {
"staged": false,
@@ -102,10 +213,10 @@ exit_code: 0
"path": "_REPO_.locked-feature",
"kind": "worktree",
"commit": {
- "sha": "a1e809f511b21ee516412a4520497f0cea4af366",
- "short_sha": "a1e809f",
+ "sha": "05a4a45d0b981dad5c27db59dca482836d59f89e",
+ "short_sha": "05a4a45",
"message": "Initial commit",
- "timestamp": 1735689600
+ "timestamp": 1735718400
},
"working_tree": {
"staged": false,
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap
index ba7ee4de4..c8b387dc8 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap
@@ -36,8 +36,8 @@ exit_code: 0
"path": "_REPO_",
"kind": "worktree",
"commit": {
- "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",
- "short_sha": "a058e79",
+ "sha": "33323bc15e5a41f2dff1a997b9cd2345d6b74871",
+ "short_sha": "33323bc",
"message": "Initial commit",
"timestamp": 1735689600
},
@@ -53,22 +53,133 @@ exit_code: 0
}
},
"main_state": "is_main",
+ "remote": {
+ "name": "origin",
+ "branch": "main",
+ "ahead": 1,
+ "behind": 0
+ },
"worktree": {
"detached": false
},
"is_main": true,
"is_current": true,
"is_previous": false,
- "statusline": "main /u001b[2m^/u001b[22m",
- "symbols": "^"
+ "statusline": "main /u001b[2m^/u001b[22m/u001b[2m⇡/u001b[22m /u001b[32m⇡1/u001b[0m",
+ "symbols": "^⇡"
+ },
+ {
+ "branch": "feature-a",
+ "path": "_REPO_.feature-a",
+ "kind": "worktree",
+ "commit": {
+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",
+ "short_sha": "1b87d47",
+ "message": "Add feature-a file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 1
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-a /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓1/u001b[0m",
+ "symbols": "↕"
+ },
+ {
+ "branch": "feature-b",
+ "path": "_REPO_.feature-b",
+ "kind": "worktree",
+ "commit": {
+ "sha": "f62940fcec424585adf98625e722fdf990810614",
+ "short_sha": "f62940f",
+ "message": "Add feature-b file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 1
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-b /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓1/u001b[0m",
+ "symbols": "↕"
+ },
+ {
+ "branch": "feature-c",
+ "path": "_REPO_.feature-c",
+ "kind": "worktree",
+ "commit": {
+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",
+ "short_sha": "345c7c9",
+ "message": "Add feature-c file",
+ "timestamp": 1735718400
+ },
+ "working_tree": {
+ "staged": false,
+ "modified": false,
+ "untracked": false,
+ "renamed": false,
+ "deleted": false,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
+ },
+ "main_state": "diverged",
+ "main": {
+ "ahead": 1,
+ "behind": 1
+ },
+ "worktree": {
+ "detached": false
+ },
+ "is_main": false,
+ "is_current": false,
+ "is_previous": false,
+ "statusline": "feature-c /u001b[2m↕/u001b[22m /u001b[32m↑1/u001b[0m /u001b[2m/u001b[31m↓1/u001b[0m",
+ "symbols": "↕"
},
{
"branch": "with-status",
"path": "_REPO_.with-status",
"kind": "worktree",
"commit": {
- "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",
- "short_sha": "a058e79",
+ "sha": "33323bc15e5a41f2dff1a997b9cd2345d6b74871",
+ "short_sha": "33323bc",
"message": "Initial commit",
"timestamp": 1735689600
},
@@ -102,8 +213,8 @@ exit_code: 0
"path": "_REPO_.without-status",
"kind": "worktree",
"commit": {
- "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",
- "short_sha": "a058e79",
+ "sha": "33323bc15e5a41f2dff1a997b9cd2345d6b74871",
+ "short_sha": "33323bc",
"message": "Initial commit",
"timestamp": 1735689600
},
diff --git a/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
index e18cf388a..fc066747d 100644
--- a/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,11 +30,14 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ../repo.diverged a86ce3fb 1d Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ../repo.feature-changes 38944dae 1d Add 100 lines
-+ fix ? – 💬 ../repo.fix a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ fix ? – 💬 ../repo.fix 05a4a45d 16h Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ../repo.diverged 96d1fd92 1d Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 ../repo.feature-changes f5306ded 1d Add 100 lines
-○ Showing 4 worktrees, 3 with changes, 2 ahead
+○ Showing 7 worktrees, 3 with changes, 5 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
index acbb4f2be..5f04914c6 100644
--- a/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,9 +30,12 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ locked-no-reason ⊞_ ../repo.locked-no-reason a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ locked-no-reason ⊞_ ../repo.locked-no-reason 05a4a45d 16h Initial commit
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
index 1fa446d27..ebd815c49 100644
--- a/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,9 +30,12 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ locked-feature ⊞_ ../repo.locked-feature a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ locked-feature ⊞_ ../repo.locked-feature 05a4a45d 16h Initial commit
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
index f772bb3a0..60399d0cb 100644
--- a/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
@@ -30,9 +30,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . c80da958 1d Short message
-+ feature-a ⊂ ↓1 ../repo.feature-a 0fcd1a46 1d This is a very long commit message that should test how the message column handles truncation and w…
+@ main ^⇡ . ⇡2 8cf0f3d3 1d Short message
++ feature-a ↕ ↑1 ↓2 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap b/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
index 9462f4355..0c071f644 100644
--- a/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,12 +30,15 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ medium-name _ ../repo.medium-name a1e809f5 1d Initial commit
-+ short _ ../repo.short a1e809f5 1d Initial commit
-+ very-long-branch-name-here _ ../repo.very-long-branch-name-here a1e809f5 1d Initial commit
-+ with-changes _ ../repo.with-changes a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ medium-name _ ../repo.medium-name 05a4a45d 16h Initial commit
++ short _ ../repo.short 05a4a45d 16h Initial commit
++ very-long-branch-name-here _ ../repo.very-long-branch-name-here 05a4a45d 16h Initial commit
++ with-changes _ ../repo.with-changes 05a4a45d 16h Initial commit
-○ Showing 5 worktrees
+○ Showing 8 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
index d854cb7a7..e00e1cf92 100644
--- a/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature +!? ↑ +2 -3 ↑1 ../repo.feature 095602ce 1d Add files
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature +!? ↑ +2 -3 ↑1 ../repo.feature da422a12 1d Add files
-○ Showing 2 worktrees, 1 with changes, 1 ahead
+○ Showing 5 worktrees, 1 with changes, 4 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
index a41f60c67..7df362f6c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-a _ ../repo.feature-a a1e809f5 1d Initial commit
-+ feature-b _ ../repo.feature-b a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 3 worktrees
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
index befe0bb56..5be2fd25f 100644
--- a/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature _ ../repo.feature a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature _ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
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 fbe090c11..2e9d26662 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,12 +30,15 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ../repo.feature-current 431987e2 23h Commit at 01:00
-^ main ^ . b8b9f445 1d Initial commit on main
-+ feature-newest ↑ ↑1 ../repo.feature-newest 721211d9 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ../repo.feature-middle a84219ce 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ../repo.feature-oldest 9777b5e4 23h Commit at 00:30
+@ feature-current ↑ ↑1 ../repo.feature-current f8d9dc91 23h Commit at 01:00
+^ main ^⇡ . ⇡1 01cab36c 1d Initial commit on main
++ feature-a ↕ ↑1 ↓1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-newest ↑ ↑1 ../repo.feature-newest 57c29ea7 21h Commit at 03:00
++ feature-middle ↑ ↑1 ../repo.feature-middle a63f3739 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ../repo.feature-oldest a9b3e5b7 23h Commit at 00:30
-○ Showing 5 worktrees, 4 ahead
+○ Showing 8 worktrees, 7 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
index a5a8bb1d5..b4339da7c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-- feature _ ../repo.feature a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
+- feature _ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
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 7c815ea14..6fc1d68ce 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ⚑^ . a1e809f5 1d Initial commit
-+ feature-a _ ../repo.feature-a a1e809f5 1d Initial commit
-+ feature-b _ ../repo.feature-b a1e809f5 1d Initial commit
+@ develop ⚑^ . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 3 worktrees
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
index 30dcd2beb..fa445a481 100644
--- a/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,10 +31,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-a _ ../repo.feature-a a1e809f5 1d Initial commit
-+ feature-b _ ../repo.feature-b a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 3 worktrees
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
index 77ef13641..f9d33c9dd 100644
--- a/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -31,11 +32,13 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-a _ ../repo.feature-a a1e809f5 1d Initial commit
- orphan-1 /_ a1e809f5 1d Initial commit
- orphan-2 /_ a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ orphan-1 /_ 05a4a45d 16h Initial commit
+ orphan-2 /_ 05a4a45d 16h Initial commit
-○ Showing 2 worktrees, 2 branches
+○ Showing 4 worktrees, 2 branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap b/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
index f2720483a..59c5d093b 100644
--- a/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
@@ -29,11 +29,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature ✗ ⋯ ../repo.feature 00000000 55y 
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature ✗ ⋯ ../repo.feature 00000000 55y 
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees. 5 tasks failed
+○ Showing 5 worktrees, 3 ahead. 5 tasks failed
----- stderr -----
▲ Some git operations failed:
diff --git a/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
index c067be4ed..7df362f6c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches.snap b/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches.snap
index a03b0c45e..d0f863e50 100644
--- a/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches.snap
@@ -31,10 +31,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . 355b9bf5 1d Third commit on main
-+ feature ↕ ↑1 ↓2 … ../repo.feature 0e04169e 1d Feature work
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ . ⇡2 c3d37f26 1d Third commit on main
++ feature-a ↕ ↑1 ↓2 … ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 … ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 … ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature ↕ ↑1 ↓2 … ../repo.feature 0acf205b 1d Feature work
-○ Showing 2 worktrees, 1 ahead
+○ Showing 5 worktrees, 4 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches_only.snap b/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches_only.snap
index 6d6d7f60b..9831ac636 100644
--- a/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches_only.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_skips_expensive_for_stale_branches_only.snap
@@ -32,10 +32,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . 355b9bf5 1d Third commit on main
- stale-branch /↓ ↓2 … a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ . ⇡2 c3d37f26 1d Third commit on main
++ feature-a ↕ ↑1 ↓2 … ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 … ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 … ../repo.feature-c 345c7c93 16h Add feature-c file
+ stale-branch /↓ ↓2 … 05a4a45d 16h Initial commit
-○ Showing 1 worktrees, 1 branches
+○ Showing 4 worktrees, 1 branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
index 9db489cdc..f810943d8 100644
--- a/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
@@ -29,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature ⊟ ⋯ ../repo.feature a1e809f5 ⋯ ⋯
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature ⊟ ⋯ ../repo.feature 05a4a45d ⋯ ⋯
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap b/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
index 0c8c34dc4..d7e22cda9 100644
--- a/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,11 +30,14 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ main-symbol ↑ 💬 ↑1 ../repo.main-symbol b69fe20d 1d Symbol commit
-+ pr-link ↑ 🤖 ↑1 ../repo.pr-link f42f2185 1d PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ../repo.wli-sequence c73070d4 1d Initial content
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ main-symbol ↑ 💬 ↑1 ../repo.main-symbol 113f1df5 1d Symbol commit
++ pr-link ↑ 🤖 ↑1 ../repo.pr-link 152b5dea 1d PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ../repo.wli-sequence 4353e28e 1d Initial content
-○ Showing 4 worktrees, 1 with changes, 3 ahead
+○ Showing 7 worktrees, 1 with changes, 6 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
index bfd8f901d..7909578a8 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,9 +30,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ⚑^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ - ⚑^ . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
index b7ffa555f..6f9cafcd0 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -31,10 +32,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-a ? – ../repo.feature-a a1e809f5 1d Initial commit
-+ feature-b ↑ ↑1 +1 -1 ../repo.feature-b 86bdffd3 1d Test commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ? ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-b ↑ ↑2 +2 -1 ../repo.feature-b 391b2a76 1d Test commit
-○ Showing 3 worktrees, 1 with changes, 1 ahead
+○ Showing 4 worktrees, 1 with changes, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
index ba3a52eb4..23dd10cde 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,18 +31,21 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-1 _ ../repo.feature-1 a1e809f5 1d Initial commit
-+ feature-10 _ ../repo.feature-10 a1e809f5 1d Initial commit
-+ feature-2 _ ../repo.feature-2 a1e809f5 1d Initial commit
-+ feature-3 _ ../repo.feature-3 a1e809f5 1d Initial commit
-+ feature-4 _ ../repo.feature-4 a1e809f5 1d Initial commit
-+ feature-5 _ ../repo.feature-5 a1e809f5 1d Initial commit
-+ feature-6 _ ../repo.feature-6 a1e809f5 1d Initial commit
-+ feature-7 _ ../repo.feature-7 a1e809f5 1d Initial commit
-+ feature-8 _ ../repo.feature-8 a1e809f5 1d Initial commit
-+ feature-9 _ ../repo.feature-9 a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-1 _ ../repo.feature-1 05a4a45d 16h Initial commit
++ feature-10 _ ../repo.feature-10 05a4a45d 16h Initial commit
++ feature-2 _ ../repo.feature-2 05a4a45d 16h Initial commit
++ feature-3 _ ../repo.feature-3 05a4a45d 16h Initial commit
++ feature-4 _ ../repo.feature-4 05a4a45d 16h Initial commit
++ feature-5 _ ../repo.feature-5 05a4a45d 16h Initial commit
++ feature-6 _ ../repo.feature-6 05a4a45d 16h Initial commit
++ feature-7 _ ../repo.feature-7 05a4a45d 16h Initial commit
++ feature-8 _ ../repo.feature-8 05a4a45d 16h Initial commit
++ feature-9 _ ../repo.feature-9 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 11 worktrees
+○ Showing 14 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
index da3df8147..fa445a481 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,11 +31,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-a _ ../repo.feature-a a1e809f5 1d Initial commit
-+ feature-b _ ../repo.feature-b a1e809f5 1d Initial commit
-+ feature-c _ ../repo.feature-c a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
index f55a067d1..fa445a481 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,9 +30,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
index 60b334ac9..13a4e6bb9 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,11 +30,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ locked ⊞_ ../repo.locked a1e809f5 1d Initial commit
-+ normal _ ../repo.normal a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ locked ⊞_ ../repo.locked 05a4a45d 16h Initial commit
++ normal _ ../repo.normal 05a4a45d 16h Initial commit
-○ Showing 3 worktrees
+○ Showing 6 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
index 659ed3621..8c95d3ecd 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,11 +31,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^| . | b8b9f445 1d Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ../repo.ahead ⇡1 a66d3071 1d Ahead commit
-+ in-sync _| ../repo.in-sync | b8b9f445 1d Initial commit on main
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ . ⇡1 01cab36c 1d Initial commit on main
++ feature-a ↕ ↑1 ↓1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ ahead ↑⇡ ↑1 +1 ../repo.ahead ⇡1 76a1bef4 1d Ahead commit
++ in-sync _| ../repo.in-sync | 01cab36c 1d Initial commit on main
-○ Showing 3 worktrees, 1 ahead
+○ Showing 6 worktrees, 4 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
index 0ce4972f2..e5f3098e3 100644
--- a/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,9 +30,12 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . d167d3cc 1d Fix bug with café ☕ handling
-+ feature-test ⊂ ↓1 ../repo.feature-test 96b95eab 1d Add support for 日本語 and émoji 🎉
+@ main ^⇡ . ⇡2 ba0edbd5 1d Fix bug with café ☕ handling
++ feature-a ↕ ↑1 ↓2 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-test ⊂ ↓1 ../repo.feature-test 4b80044d 1d Add support for 日本語 and émoji 🎉
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap b/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
index 31c2184d5..59a7d23ec 100644
--- a/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,11 +29,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ emoji _ 🔄 ../repo.emoji a1e809f5 1d Initial commit
-+ multi _ 👨‍💻 ../repo.multi a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ emoji _ 🔄 ../repo.emoji 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ multi _ 👨‍💻 ../repo.multi 05a4a45d 16h Initial commit
-○ Showing 3 worktrees
+○ Showing 6 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
index 07d3a9505..6fc1d68ce 100644
--- a/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ⚑^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ develop ⚑^ . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
index 1d9623e63..500ae2fa8 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,12 +31,15 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-with-worktree _ ../repo.feature-with-worktree a1e809f5 1d Initial commit
- another-branch /_ a1e809f5 1d Initial commit
- feature-without-worktree /_ a1e809f5 1d Initial commit
- fix-bug /_ a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-with-worktree _ ../repo.feature-with-worktree 05a4a45d 16h Initial commit
+ another-branch /_ 05a4a45d 16h Initial commit
+ feature-without-worktree /_ 05a4a45d 16h Initial commit
+ fix-bug /_ 05a4a45d 16h Initial commit
-○ Showing 2 worktrees, 3 branches
+○ Showing 5 worktrees, 3 branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
index 6cfc2d3b7..8cc74f059 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,10 +31,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-a _ ../repo.feature-a a1e809f5 1d Initial commit
-+ feature-b _ ../repo.feature-b a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 3 worktrees
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
index db07d6d2d..4fe19ab24 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,12 +30,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
- branch-alpha /_ a1e809f5 1d Initial commit
- branch-beta /_ a1e809f5 1d Initial commit
- branch-gamma /_ a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ branch-alpha /_ 05a4a45d 16h Initial commit
+ branch-beta /_ 05a4a45d 16h Initial commit
+ branch-gamma /_ 05a4a45d 16h Initial commit
-○ Showing 1 worktrees, 3 branches
+○ Showing 4 worktrees, 3 branches, 3 ahead
----- stderr -----
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 a19368ac6..fc3362e7e 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
@@ -4,14 +4,15 @@ info:
program: wt
args:
- "-C"
- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmps30IlV/repo
+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCRjBk9/repo
- list
env:
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_EDITOR: ""
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
---
@@ -19,10 +20,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-a _ ../repo.feature-a a1e809f5 1d Initial commit
-+ feature-b _ ../repo.feature-b a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 3 worktrees
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
index bff01a801..11c72986f 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
@@ -29,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ⋯ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ⋯ . | 05a4a45d 16h Initial commit
++ feature-a ⋯ ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ⋯ ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ⋯ ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees
----- stderr -----
▲ Configured default branch nonexistent does not exist locally
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
index 3609c5457..dba1aed04 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,13 +31,16 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| . | a1e809f5 1d Initial commit
- local-only-1 /_ a1e809f5 1d Initial commit
- local-only-2 /_ a1e809f5 1d Initial commit
- origin/remote-only-1 /_ a1e809f5 1d Initial commit
- origin/remote-only-2 /_ a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ local-only-1 /_ 05a4a45d 16h Initial commit
+ local-only-2 /_ 05a4a45d 16h Initial commit
+ origin/remote-only-1 /_ 05a4a45d 16h Initial commit
+ origin/remote-only-2 /_ 05a4a45d 16h Initial commit
-○ Showing 1 worktrees, 2 branches, 2 remote branches
+○ Showing 4 worktrees, 2 branches, 2 remote branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
index ac4a7145f..585eaa3e1 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| . | a1e809f5 1d Initial commit
- origin/remote-only /_ a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ origin/remote-only /_ 05a4a45d 16h Initial commit
-○ Showing 1 worktrees, 1 remote branches
+○ Showing 4 worktrees, 1 remote branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
index 50beb265e..b962f2de1 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,10 +31,13 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| . | a1e809f5 1d Initial commit
-+ feature-with-worktree _| ../repo.feature-with-worktree | a1e809f5 1d Initial commit
- origin/remote-only /_ a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-with-worktree _| ../repo.feature-with-worktree | 05a4a45d 16h Initial commit
+ origin/remote-only /_ 05a4a45d 16h Initial commit
-○ Showing 2 worktrees, 1 remote branches
+○ Showing 5 worktrees, 1 remote branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
index 650e23f0c..af70c62ef 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,11 +30,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| . | a1e809f5 1d Initial commit
- origin/remote-feature-1 /_ a1e809f5 1d Initial commit
- origin/remote-feature-2 /_ a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ origin/remote-feature-1 /_ 05a4a45d 16h Initial commit
+ origin/remote-feature-2 /_ 05a4a45d 16h Initial commit
-○ Showing 1 worktrees, 2 remote branches
+○ Showing 4 worktrees, 2 remote branches, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
index f6a88e2ed..cbb335660 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,10 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a058e792 1d Initial commit
-+ feature-api ↑ 🤖 ↑1 ../repo.feature-api 95e48b49 1d Add REST API endpoints
-+ review-ui ? ↑ 💬 ↑1 ../repo.review-ui 46b6a187 1d Add dashboard component
-+ wip-docs ? – ../repo.wip-docs a058e792 1d Initial commit
+@ main ^⇡ . ⇡1 33323bc1 1d Initial commit
++ feature-api ↑ 🤖 ↑1 ../repo.feature-api 70343f03 1d Add REST API endpoints
++ review-ui ? ↑ 💬 ↑1 ../repo.review-ui a585d6ed 1d Add dashboard component
++ wip-docs ? – ../repo.wip-docs 33323bc1 1d Initial commit
○ Showing 4 worktrees, 2 with changes, 2 ahead
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 62229497b..713e056d3 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ . ⇡1 9dd6c628 1d Main advances
-+ feature +!?⊞✗⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ../repo.feature ⇡1 ⇣1 88205002 1d Local commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ . ⇡2 c51a68f7 1d Main advances
++ feature-a ↕ ↑1 ↓2 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature +!?⊞✗⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ../repo.feature ⇡1 ⇣1 342be366 1d Local commit
-○ Showing 2 worktrees, 1 with changes, 1 ahead
+○ Showing 5 worktrees, 1 with changes, 4 ahead
----- stderr -----
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 ef5771771..e78690d9d 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
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . 1c3b3fec 1d Main conflicting changes
-+ feature +!?✘– 🤖 +7 ../repo.feature 1c3b3fec 1d Main conflicting changes
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ . ⇡2 27eb0ee8 1d Main conflicting changes
++ feature-a ↕ ↑1 ↓2 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature +!?✘– 🤖 +7 ../repo.feature 27eb0ee8 1d Main conflicting changes
-○ Showing 2 worktrees, 1 with changes
+○ Showing 5 worktrees, 1 with changes, 3 ahead
----- stderr -----
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 1167215db..c76300276 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,9 +30,9 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 ec97decc 30m Add API tests
-^ main ^⇅ ⇡1 ⇣1 6088adb3 4d Merge fix-auth: hardened to…
-+ fix-auth ↕| ↑2 ↓1 | 127407de 5h Add secure token storage
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 6814f02a 30m Add API tests
+^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth: hardened to…
++ fix-auth ↕| ↑2 ↓1 | b772e68b 5h Add secure token storage
○ Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden
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 7ce53b2bf..64c235d09 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
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -31,11 +32,11 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ CI Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 ● ec97decc 30m Add API tests
-^ main ^⇅ ⇡1 ⇣1 ● 6088adb3 4d Merge fix-au…
-+ fix-auth ↕| ↑2 ↓1 +25 -11 | ● 127407de 5h Add secure t…
- exp /↕ ↑2 ↓1 +137 99e114de 2d Add GraphQL…
- wip /↕ ↑1 ↓1 +33 d62fd0e8 3d Start API do…
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 ● 6814f02a 30m Add API tests
+^ main ^⇅ ⇡1 ⇣1 ● 41ee0834 4d Merge fix-au…
++ fix-auth ↕| ↑2 ↓1 +25 -11 | ● b772e68b 5h Add secure t…
+ exp /↕ ↑2 ↓1 +137 96379229 2d Add GraphQL…
+ wip /↕ ↑1 ↓1 +33 b40716dc 3d Start API do…
○ 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 578c4026e..cdb936d6a 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
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,9 +31,9 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ CI Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 ● ec97decc 30m Add API tests
-^ main ^⇅ ⇡1 ⇣1 ● 6088adb3 4d Merge fix-au…
-+ fix-auth ↕| ↑2 ↓1 +25 -11 | ● 127407de 5h Add secure t…
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 ● 6814f02a 30m Add API tests
+^ main ^⇅ ⇡1 ⇣1 ● 41ee0834 4d Merge fix-au…
++ fix-auth ↕| ↑2 ↓1 +25 -11 | ● b772e68b 5h Add secure t…
○ Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden
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 246194944..c564a9397 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
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -30,12 +31,15 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ../repo.feature-current 431987e2 23h Commit at 01:00
-^ main ^ . b8b9f445 1d Initial commit on main
-+ feature-newest ↑ ↑1 ../repo.feature-newest 721211d9 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ../repo.feature-middle a84219ce 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ../repo.feature-oldest 9777b5e4 23h Commit at 00:30
+@ feature-current ↑ ↑1 ../repo.feature-current f8d9dc91 23h Commit at 01:00
+^ main ^⇡ . ⇡1 01cab36c 1d Initial commit on main
++ feature-a ↕ ↑1 ↓1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-newest ↑ ↑1 ../repo.feature-newest 57c29ea7 21h Commit at 03:00
++ feature-middle ↑ ↑1 ../repo.feature-middle a63f3739 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ../repo.feature-oldest a9b3e5b7 23h Commit at 00:30
-○ Showing 5 worktrees, 4 ahead
+○ Showing 8 worktrees, 7 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap b/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
index fb07d58cb..5d9eb7bbb 100644
--- a/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
+++ b/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,9 +30,9 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Remote⇅ URL Commit Age
-@ main ? ^⇅ ⇡1 ⇣1 http://localhost:12107 6088adb3 4d
-+ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 http://localhost:10703 ec97decc 30m
-+ fix-auth ↕| ↑2 ↓1 | http://localhost:16460 127407de 5h
+@ main ? ^⇅ ⇡1 ⇣1 http://localhost:12107 41ee0834 4d
++ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 http://localhost:10703 6814f02a 30m
++ fix-auth ↕| ↑2 ↓1 | http://localhost:16460 b772e68b 5h
○ Showing 3 worktrees, 2 with changes, 2 ahead, 2 columns hidden
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 c8a44cb4b..5d9e0722d 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -31,13 +32,16 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^| . | b8b9f445 1d Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ../repo.ahead ⇡2 9c8b56b3 1d Ahead commit 2
-+ behind _⇣ ../repo.behind ⇣1 b8b9f445 1d Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ../repo.diverged ⇡1 ⇣1 3b16f5c5 1d Diverged local commit
-+ in-sync _| ../repo.in-sync | b8b9f445 1d Initial commit on main
-+ no-upstream _ ../repo.no-upstream b8b9f445 1d Initial commit on main
+@ main ^⇡ . ⇡1 01cab36c 1d Initial commit on main
++ feature-a ↕ ↑1 ↓1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ ahead ↑⇡ ↑2 +2 ../repo.ahead ⇡2 a25eff2a 1d Ahead commit 2
++ behind _⇣ ../repo.behind ⇣1 01cab36c 1d Initial commit on main
++ diverged ↑⇅ ↑1 +1 ../repo.diverged ⇡1 ⇣1 f035d2c5 1d Diverged local commit
++ in-sync _| ../repo.in-sync | 01cab36c 1d Initial commit on main
++ no-upstream _ ../repo.no-upstream 01cab36c 1d Initial commit on main
-○ Showing 6 worktrees, 2 ahead
+○ Showing 9 worktrees, 5 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
index 8e77afff7..2f9afc1f2 100644
--- a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ . f31b5717 1d Main changes shared.txt
-+ feature ! ✗ +1 -1 ↓1 ../repo.feature 523c1c09 1d Initial commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ . ⇡2 1edd043e 1d Main changes shared.txt
++ feature-a ↕ ↑1 ↓2 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature ! ✗ +1 -1 ↓1 ../repo.feature a756a743 1d Initial commit
-○ Showing 2 worktrees, 1 with changes
+○ Showing 5 worktrees, 1 with changes, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
index db2102a6c..e4655e6b9 100644
--- a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . f31b5717 1d Main changes shared.txt
-+ feature ! ↓ +1 -1 ↓1 ../repo.feature 523c1c09 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^⇡ . ⇡2 1edd043e 1d Main changes shared.txt
++ feature-a ↕ ↑1 ↓2 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature ! ↓ +1 -1 ↓1 ../repo.feature a756a743 1d Initial commit
-○ Showing 2 worktrees, 1 with changes
+○ Showing 5 worktrees, 1 with changes, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
index e780f1f9a..1dbaf43ed 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ test !? ↑ +1 -1 ↑1 ../repo.test 689d5d16 1d Test
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ test !? ↑ +1 -1 ↑1 ../repo.test 572ec619 1d Test
-○ Showing 2 worktrees, 1 with changes, 1 ahead
+○ Showing 5 worktrees, 1 with changes, 4 ahead
----- stderr -----
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 77ea47fa8..901371709 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,11 +29,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ complex + ? ↑ +1 -1 ↑1 ../repo.complex 42162296 1d Complex
-+ simple ? ↑ ↑1 ../repo.simple 63ee5cb5 1d Simple
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ complex + ? ↑ +1 -1 ↑1 ../repo.complex 0fdc439a 1d Complex
++ simple ? ↑ ↑1 ../repo.simple 42a9d012 1d Simple
-○ Showing 3 worktrees, 2 with changes, 2 ahead
+○ Showing 6 worktrees, 2 with changes, 5 ahead
----- stderr -----
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 818bfce90..778786118 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
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 da3f48937..906634ba9 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
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,10 +30,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
- feature /_ a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ feature /_ 05a4a45d 16h Initial commit
-○ Showing 1 worktrees, 1 branches
+○ Showing 4 worktrees, 1 branches, 3 ahead
----- stderr -----
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 818bfce90..778786118 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
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 818bfce90..778786118 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
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 818bfce90..778786118 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap b/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
index c8ddfe247..aad7dc4c2 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ URL Commit Age Message
-@ main ? ^ . http://localhost:12107 a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ URL Commit Age Message
+@ main ? ^| . | http://localhost:12107 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a http://localhost:11521 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b http://localhost:14072 f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c http://localhost:14303 345c7c93 16h Add feature-c file
-○ Showing 1 worktree, 1 with changes
+○ Showing 4 worktrees, 1 with changes, 3 ahead
----- stderr -----
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 d26789ef9..e102f6c2f 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
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -32,7 +33,7 @@ exit_code: 0
----- stderr -----
◎ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-↳ Backup created @ 14fc72d
+↳ Backup created @ d5452aa
◎ Generating squash commit message...
  fix: update file 1 content
✓ Squashed @ [HASH]
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 8f033ada4..b52ba2a14 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
@@ -33,7 +33,7 @@ exit_code: 0
----- stderr -----
◎ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-↳ Backup created @ 183cc8b
+↳ Backup created @ ba39431
◎ Generating squash commit message...
↳ Using fallback commit message. For LLM setup guide, run wt config --help
  Squash commits from main
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 fe8ba2e2d..74ca92eb2 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
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -32,7 +33,7 @@ exit_code: 0
----- stderr -----
◎ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-↳ Backup created @ 5e120d3
+↳ Backup created @ bcc96d5
◎ Generating squash commit message...
  fix: improve auth validation logic
✓ Squashed @ [HASH]
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 47c0037c9..fdc54cce2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -34,7 +35,8 @@ exit_code: 1
◎ Rebasing onto main...
✗ Rebase onto main incomplete
  Rebasing (1/1)
-  error: could not apply bed6661... Update shared.txt in feature
-  Could not apply bed6661... # Update shared.txt in feature
+  error: could not apply b0165c1... Update shared.txt in feature
+  Recorded preimage for 'shared.txt'
+  Could not apply b0165c1... # 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_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
index 927327f05..f6fd7e171 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
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update files"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
@@ -34,7 +35,7 @@ exit_code: 0
----- stderr -----
◎ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-↳ Backup created @ 14fc72d
+↳ Backup created @ d5452aa
◎ Generating squash commit message...
  fix: update files
✓ Squashed @ [HASH]
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 2e19f7f79..17f487c7b 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
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
@@ -37,7 +38,7 @@ exit_code: 0
  untracked1.txt
  untracked2.txt
◎ Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
-↳ Backup created @ fefa700
+↳ Backup created @ a40b656
◎ Generating squash commit message...
  fix: commit changes
✓ Squashed @ [HASH]
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_with_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_with_both_flags.snap
index 5247e8af6..382bda569 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_with_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_with_both_flags.snap
@@ -38,7 +38,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 @ ef0df66
+↳ Backup created @ 91a335e
◎ Generating squash commit message...
  squash: combined commits
✓ Squashed @ [HASH]
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_with_stage_tracked_flag.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_with_stage_tracked_flag.snap
index 666683afc..15bb7eb20 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_with_stage_tracked_flag.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_with_stage_tracked_flag.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
@@ -35,7 +36,7 @@ exit_code: 0
----- stderr -----
◎ Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
-↳ Backup created @ 6aa1805
+↳ Backup created @ d8f4370
◎ Generating squash commit message...
  squash: combined commits
✓ Squashed @ [HASH]
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 1eb93a950..402dfa419 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
@@ -35,9 +35,9 @@ exit_code: 0
----- stderr -----
◎ Running post-create project:commit @ _REPO_.feature:
-  echo 'Commit: 5caad75ed9319b7bd5c35c626d7051d252f987e7' > git_vars.txt
+  echo 'Commit: f9680d376e0968fcb45a0029cf83898054742923' > git_vars.txt
◎ Running post-create project:short @ _REPO_.feature:
-  echo 'Short: 5caad75' >> git_vars.txt
+  echo 'Short: f9680d3' >> git_vars.txt
◎ Running post-create project:remote @ _REPO_.feature:
  echo 'Remote: origin' >> git_vars.txt
◎ Running post-create project:worktree_name @ _REPO_.feature:
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits.snap
index d7376c715..ef102ecc6 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits.snap
@@ -9,7 +9,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -22,6 +22,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -33,7 +34,7 @@ exit_code: 0
----- stderr -----
◎ Pushing 3 commits to main @ [HASH]
-  * 2489484 Merge temp
+  * fc1fab1 Merge temp
  |/
  | * [HASH] Commit 2
  |/
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap
index 43f3405a4..aaa36390d 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
index 457239059..00e7531ad 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -32,4 +32,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-◎ Removing feature-a worktree & branch in background (same commit as main, _)
+◎ Removing feature-a worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-a -D
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
index ed6feb413..7a26f3963 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -32,4 +32,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-◎ Removing feature-b worktree & branch in background (same commit as main, _)
+◎ Removing feature-b worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-b -D
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_detached_worktree_in_multi.snap b/tests/snapshots/integration__integration_tests__remove__remove_detached_worktree_in_multi.snap
index a692cb172..27650f3e7 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_detached_worktree_in_multi.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_detached_worktree_in_multi.snap
@@ -33,6 +33,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-◎ Removing feature-a worktree & branch in background (same commit as main, _)
+◎ Removing feature-a worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-a -D
▲ No worktree found for branch feature-b
-✓ Removed branch feature-b (same commit as main, _)
+○ Branch feature-b retained; has unmerged changes
+↳ To delete the unmerged branch, run wt remove feature-b -D
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index fe6cf46e2..44447f305 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
@@ -10,7 +10,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -34,8 +34,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-◎ Removing feature-b worktree & branch in background (same commit as main, _)
-◎ Removing feature-c worktree & branch in background (same commit as main, _)
-◎ Removing feature-a worktree & branch in background (same commit as main, _)
+◎ Removing feature-b worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-b -D
+◎ Removing feature-c worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-c -D
+◎ Removing feature-a worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-a -D
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
index b59d04464..8e73d166e 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
@@ -10,7 +10,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -34,6 +34,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-◎ Removing feature-a worktree & branch in background (same commit as main, _)
-◎ Removing feature-b worktree & branch in background (same commit as main, _)
-◎ Removing feature-c worktree & branch in background (same commit as main, _)
+◎ Removing feature-a worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-a -D
+◎ Removing feature-b worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-b -D
+◎ Removing feature-c worktree in background
+↳ Branch unmerged; to delete, run wt remove feature-c -D
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 51f7f6008..11bdb1aed 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,10 +29,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 85d55864 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature _ ../repo.feature 85d55864 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^⇡ . ⇡1 252b848b 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature-a ↕ ↑1 ↓1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature _ ../repo.feature 252b848b 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-○ Showing 2 worktrees
+○ Showing 5 worktrees, 3 ahead
----- stderr -----
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 2445ae6d9..9fd6953bc 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,9 +29,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 1 worktree
+○ Showing 4 worktrees, 3 ahead
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__select__select_abort_escape.snap b/tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
index 17cad6272..9d488b86b 100644
--- a/tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
+++ b/tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
@@ -4,7 +4,7 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Remote⇅ Commit │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> @ main ^ a1e809f5 │
+> @ main ^ 05a4a45d │
│○ main has no uncommitted changes
│
│
diff --git a/tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
index f0ff969ee..a8ca07e94 100644
--- a/tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
@@ -4,9 +4,9 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Remote⇅ Age │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> @ main ^ 1d │
- + feature-one _ 1d │○ main has no uncommitted changes
- + feature-two _ 1d │
+> @ main ^ 16h │
+ + feature-one _ 16h │○ main has no uncommitted changes
+ + feature-two _ 16h │
│
│
│
diff --git a/tests/snapshots/integration__integration_tests__select__select_preview_log.snap b/tests/snapshots/integration__integration_tests__select__select_preview_log.snap
index 83438ff4d..05423fe9b 100644
--- a/tests/snapshots/integration__integration_tests__select__select_preview_log.snap
+++ b/tests/snapshots/integration__integration_tests__select__select_preview_log.snap
@@ -4,13 +4,13 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Remote⇅ Commit │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> + feature ↑ ↑5 a7f9eb..│
- │* a7f9ebb +1 1d (feature) Add file 5 with content
- │* cd19d36 +1 1d Add file 4 with content
- │* 17c13c5 +1 1d Add file 3 with content
- │* fad018c +1 1d Add file 2 with content
- │* 8df4920 +1 1d Add file 1 with content
- │* a1e809f +3 1d (HEAD -> main) Initial commit
+> + feature ↑ ↑5 855962..│
+ │* 8559621 +1 1d (feature) Add file 5 with content
+ │* b8208db +1 1d Add file 4 with content
+ │* 046917d +1 1d Add file 3 with content
+ │* b0684ea +1 1d Add file 2 with content
+ │* 19be611 +1 1d Add file 1 with content
+ │* 05a4a45 +2 16h (HEAD -> main) Initial commit
│
│
│
diff --git a/tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap b/tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
index 5c0b49930..922366cbc 100644
--- a/tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
+++ b/tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
@@ -4,7 +4,7 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Remote⇅ Commit │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> + feature ↑ ↑2 b03ed3..│
+> + feature ↑ ↑2 d1ceec..│
│ feature_code.rs | 6 ++++++
│ tests.rs | 4 ++++
│ 2 files changed, 10 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap b/tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
index 7b1d43721..0159fbd00 100644
--- a/tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
+++ b/tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
@@ -4,7 +4,7 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Remote⇅ Commit │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> + feature ! ↑ +3 -1 ↑1 ef7f61..│
+> + feature ! ↑ +3 -1 ↑1 c605f9..│
│ tracked.txt | 4 +++-
│ 1 file changed, 3 insertions(+), 1 deletion(-)
│diff --git a/tracked.txt b/tracked.txt
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 7c64aa71f..292ee21ca 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
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,11 +30,14 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ also-no-changes _ ../repo.also-no-changes a1e809f5 1d Initial commit
-+ no-changes _ ../repo.no-changes a1e809f5 1d Initial commit
-+ with-changes ! – +1 -1 ../repo.with-changes a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ also-no-changes _ ../repo.also-no-changes 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ no-changes _ ../repo.no-changes 05a4a45d 16h Initial commit
++ with-changes ! – +1 -1 ../repo.with-changes 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 1 with changes
+○ Showing 7 worktrees, 1 with changes, 3 ahead
----- stderr -----
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 7331de799..5ee91f04b 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
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,11 +29,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ huge ? – ../repo.huge a1e809f5 1d Initial commit
-+ tiny ! – +1 -1 ../repo.tiny a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ huge ? – ../repo.huge 05a4a45d 16h Initial commit
++ tiny ! – +1 -1 ../repo.tiny 05a4a45d 16h Initial commit
-○ Showing 3 worktrees, 2 with changes
+○ Showing 6 worktrees, 2 with changes, 3 ahead
----- stderr -----
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 f84c76d70..aa4ecceab 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
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,11 +30,14 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ feature-large ? – ../repo.feature-large a1e809f5 1d Initial commit
-+ feature-medium ? – ../repo.feature-medium a1e809f5 1d Initial commit
-+ feature-small ? – ../repo.feature-small a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-large ? – ../repo.feature-large 05a4a45d 16h Initial commit
++ feature-medium ? – ../repo.feature-medium 05a4a45d 16h Initial commit
++ feature-small ? – ../repo.feature-small 05a4a45d 16h Initial commit
-○ Showing 4 worktrees, 3 with changes
+○ Showing 7 worktrees, 3 with changes, 3 ahead
----- stderr -----
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 ab0c99337..7367daea6 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -29,11 +30,14 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ another-extremely-long-name-here _ ../repo.another-extremely-long-name-here a1e809f5 1d Initial commit
-+ short _ ../repo.short a1e809f5 1d Initial commit
-+ very-long-feature-branch-name _ ../repo.very-long-feature-branch-name a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ another-extremely-long-name-here _ ../repo.another-extremely-long-name-here 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ short _ ../repo.short 05a4a45d 16h Initial commit
++ very-long-feature-branch-name _ ../repo.very-long-feature-branch-name 05a4a45d 16h Initial commit
-○ Showing 4 worktrees
+○ Showing 7 worktrees, 3 ahead
----- stderr -----
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 63065ea27..66be81cf4 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
@@ -30,11 +30,14 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues _ ../repo.extremely-long-branch-name-that-might-cause-layout-issues a1e809f5 1d Initial commit
-+ medium _ ../repo.medium a1e809f5 1d Initial commit
-+ x _ ../repo.x a1e809f5 1d Initial commit
+@ main ^| . | 05a4a45d 16h Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues _ ../repo.extremely-long-branch-name-that-might-cause-layout-issues 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ medium _ ../repo.medium 05a4a45d 16h Initial commit
++ x _ ../repo.x 05a4a45d 16h Initial commit
-○ Showing 4 worktrees
+○ Showing 7 worktrees, 3 ahead
----- stderr -----
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 c6f498b92..56e845997 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,12 +29,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ a _ ../repo.a a1e809f5 1d Initial commit
-+ bb _ ../repo.bb a1e809f5 1d Initial commit
-+ ccc _ ../repo.ccc a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ a _ ../repo.a 05a4a45d 16h Initial commit
++ bb _ ../repo.bb 05a4a45d 16h Initial commit
++ ccc _ ../repo.ccc 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-○ Showing 4 worktrees
+○ Showing 7 worktrees, 3 ahead
----- stderr -----
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 f9bf5ad58..4c4072bff 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
@@ -7,7 +7,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -20,6 +20,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -28,12 +29,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . a1e809f5 1d Initial commit
-+ cafe _ ../repo.cafe a1e809f5 1d Initial commit
-+ naive _ ../repo.naive a1e809f5 1d Initial commit
-+ resume _ ../repo.resume a1e809f5 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | 05a4a45d 16h Initial commit
++ cafe _ ../repo.cafe 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ naive _ ../repo.naive 05a4a45d 16h Initial commit
++ resume _ ../repo.resume 05a4a45d 16h Initial commit
-○ Showing 4 worktrees
+○ Showing 7 worktrees, 3 ahead
----- stderr -----
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.snap
similarity index 87%
rename from tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap
rename to tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature.snap
index b93f903e2..de1f45345 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.snap
@@ -4,11 +4,11 @@ info:
program: wt
args:
- switch
- - feature-a
+ - ping-pong
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -32,6 +32,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✓ Created worktree for feature-a @ _REPO_.feature-a
+✓ Created worktree for ping-pong @ _REPO_.ping-pong
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
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_to_main.snap
similarity index 96%
rename from tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap
rename to tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_to_main.snap
index 5f8c5ed14..0e600cdd3 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_to_main.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
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.snap
similarity index 83%
rename from tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap
rename to tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature.snap
index de14364f0..c00aab3f9 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.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -31,5 +32,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-▲ Worktree for feature-a @ _REPO_.feature-a, but cannot change directory — shell integration not installed
+▲ Worktree for ping-pong @ _REPO_.ping-pong, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
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_again.snap
similarity index 83%
rename from tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap
rename to tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_again.snap
index de14364f0..c00aab3f9 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_again.snap
@@ -8,7 +8,7 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -21,6 +21,7 @@ info:
PATH: "[PATH]"
RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -31,5 +32,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-▲ Worktree for feature-a @ _REPO_.feature-a, but cannot change directory — shell integration not installed
+▲ Worktree for ping-pong @ _REPO_.ping-pong, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
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 b93f903e2..565baf42f 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
@@ -4,11 +4,11 @@ info:
program: wt
args:
- switch
- - feature-a
+ - test-feat-x
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "150"
+ COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
@@ -32,6 +32,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✓ Created worktree for feature-a @ _REPO_.feature-a
+✓ Created worktree for test-feat-x @ _REPO_.test-feat-x
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install