Skip to content

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

Test: enable for_each tests on Windows (#166)

Maximilian Roosd1480a5b0ee3
diff --git a/README.md b/README.md
index c4a368be4..cc2196a1d 100644
--- a/README.md
+++ b/README.md
@@ -86,9 +86,9 @@ See all worktrees at a glance:
```console
$ wt list
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 d35485d7 30m Add API tests
-^ main ^⇅ ./repo ⇡1 ⇣1 e18e1b4d 4d Merge fix-auth:…
-+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 2517d700 5h Add secure token…
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 ec97decc 30m Add API tests
+^ main ^⇅ ./repo ⇡1 ⇣1 6088adb3 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 127407de 5h Add secure token…
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
```
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index 3d6a25547..04e5868a7 100644
--- a/docs/content/claude-code.md
+++ b/docs/content/claude-code.md
@@ -17,10 +17,10 @@ The plugin adds status indicators to `wt list`:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>main</b> <span class=d>^</span> <b>./repo</b> <span class=d>002eabd0</span> <span class=d>1d</span> <span class=d>Initial commit</span>
-+ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> ./repo.feature-api <span class=d>2f045483</span> <span class=d>1d</span> <span class=d>Add REST API endpoints</span>
-+ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> ./repo.review-ui <span class=d>b8c11f99</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
-+ <span class=d>wip-docs</span> <span class=c>?</span> <span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>002eabd0</span> <span class=d>1d</span> <span class=d>Initial commit</span>
+@ <b>main</b> <span class=d>^</span> <b>./repo</b> <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>
++ <span class=d>wip-docs</span> <span class=c>?</span> <span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>a058e792</span> <span class=d>1d</span> <span class=d>Initial commit</span>
⚪ <span class=d>Showing 4 worktrees, 2 ahead</span>
{% end %}
diff --git a/docs/content/list.md b/docs/content/list.md
index 587cd4717..b65294a84 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -21,9 +21,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>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>d35485d7</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>e18e1b4d</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>2517d700</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>
{% end %}
@@ -37,9 +37,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>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>d35485d7</span> <span class=d>30m</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>e18e1b4d</span> <span class=d>4d</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>2517d700</span> <span class=d>5h</span>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>6088adb3</span> <span class=d>4d</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span>
⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
{% end %}
@@ -53,11 +53,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>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>d35485d7</span> <span class=d>30m</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>e18e1b4d</span> <span class=d>4d</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>2517d700</span> <span class=d>5h</span>
- exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>52cad122</span> <span class=d>2d</span>
- wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>7ca6d817</span> <span class=d>3d</span>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>ec97decc</span> <span class=d>30m</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>6088adb3</span> <span class=d>4d</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>127407de</span> <span class=d>5h</span>
+ exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>99e114de</span> <span class=d>2d</span>
+ wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>d62fd0e8</span> <span class=d>3d</span>
⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
{% end %}
diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.md
index 6de964c76..9e94a0233 100644
--- a/docs/content/worktrunk.md
+++ b/docs/content/worktrunk.md
@@ -73,9 +73,9 @@ See all worktrees at a glance:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>d35485d7</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>e18e1b4d</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>2517d700</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>ec97decc</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>
{% end %}
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 455b85411..8252ab6d1 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -454,6 +454,13 @@ fn copy_fixture_template(dest: &Path) {
// Copy file.txt (part of the initial commit)
std::fs::copy(template.join("file.txt"), repo_path.join("file.txt")).unwrap();
+ // Copy .gitattributes (forces LF line endings on all platforms)
+ std::fs::copy(
+ template.join(".gitattributes"),
+ repo_path.join(".gitattributes"),
+ )
+ .unwrap();
+
// Copy gitconfig
std::fs::copy(template.join("gitconfig"), dest.join("test-gitconfig")).unwrap();
}
diff --git a/tests/fixtures/template-repo/.gitattributes b/tests/fixtures/template-repo/.gitattributes
new file mode 100644
index 000000000..8dc927875
--- /dev/null
+++ b/tests/fixtures/template-repo/.gitattributes
@@ -0,0 +1,2 @@
+# Force LF line endings for all text files
+* text=auto eol=lf
diff --git a/tests/fixtures/template-repo/_git/index b/tests/fixtures/template-repo/_git/index
index bd148bd40..e06b84058 100644
Binary files a/tests/fixtures/template-repo/_git/index and b/tests/fixtures/template-repo/_git/index differ
diff --git a/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fda b/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fda
deleted file mode 100644
index 915806835..000000000
--- a/tests/fixtures/template-repo/_git/objects/23/e5a15006b67068f23d976a978dfffdb68e5fda
+++ /dev/null
@@ -1,2 +0,0 @@
-x���
-1 D=�+r���f� �ջ~@["�V��|~�s��7��ZpƝvBHS���� #F�c�%aBa��h��)�6�pT�g���Z�[=u������,�7��;wy-q��}Y6�
\ No newline at end of file
diff --git a/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8 b/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8
deleted file mode 100644
index 564346681..000000000
Binary files a/tests/fixtures/template-repo/_git/objects/4e/6165406b6826c8a41f42e3148117ab89b1b1e8 and /dev/null differ
diff --git a/tests/fixtures/template-repo/_git/objects/6c/b382c5e1a55e3935e5a3e33913cc3ec47c49a5 b/tests/fixtures/template-repo/_git/objects/6c/b382c5e1a55e3935e5a3e33913cc3ec47c49a5
new file mode 100644
index 000000000..c7c36e114
--- /dev/null
+++ b/tests/fixtures/template-repo/_git/objects/6c/b382c5e1a55e3935e5a3e33913cc3ec47c49a5
@@ -0,0 +1 @@
+x+)JMU0�`040031Q�K�,I,))�L*-I-f�=��x{vv����6�_~�pAU�e��T�0D}q������`�D�Y�El�_�!�
\ No newline at end of file
diff --git a/tests/fixtures/template-repo/_git/objects/8d/c9278751db9b6b8dc85f72558621fae0fa7c0a b/tests/fixtures/template-repo/_git/objects/8d/c9278751db9b6b8dc85f72558621fae0fa7c0a
new file mode 100644
index 000000000..3b57ea7e4
Binary files /dev/null and b/tests/fixtures/template-repo/_git/objects/8d/c9278751db9b6b8dc85f72558621fae0fa7c0a differ
diff --git a/tests/fixtures/template-repo/_git/objects/a1/e809f511b21ee516412a4520497f0cea4af366 b/tests/fixtures/template-repo/_git/objects/a1/e809f511b21ee516412a4520497f0cea4af366
new file mode 100644
index 000000000..260c4f4be
--- /dev/null
+++ b/tests/fixtures/template-repo/_git/objects/a1/e809f511b21ee516412a4520497f0cea4af366
@@ -0,0 +1,2 @@
+x���
+1 D=�+r�5����]? ��k��߈_��a��Ho��L;����QH)$%FE, EPe�e*L�������6������� Ҍ���c�}to��|�.�j����`�5
\ No newline at end of file
diff --git a/tests/fixtures/template-repo/_git/refs/heads/main b/tests/fixtures/template-repo/_git/refs/heads/main
index a735b6ef7..fd35c138f 100644
--- a/tests/fixtures/template-repo/_git/refs/heads/main
+++ b/tests/fixtures/template-repo/_git/refs/heads/main
@@ -1 +1 @@
-23e5a15006b67068f23d976a978dfffdb68e5fda
+a1e809f511b21ee516412a4520497f0cea4af366
diff --git a/tests/integration_tests/for_each.rs b/tests/integration_tests/for_each.rs
index eefccdbe2..fc890b1d5 100644
--- a/tests/integration_tests/for_each.rs
+++ b/tests/integration_tests/for_each.rs
@@ -13,8 +13,6 @@ fn snapshot_for_each(test_name: &str, repo: &TestRepo, args: &[&str]) {
});
}
-/// Skipped on Windows: git status shows line-ending differences (CRLF vs LF).
-#[cfg_attr(windows, ignore)]
#[rstest]
fn test_for_each_single_worktree(repo: TestRepo) {
// Only main worktree exists
@@ -25,8 +23,6 @@ fn test_for_each_single_worktree(repo: TestRepo) {
);
}
-/// Skipped on Windows: git status shows line-ending differences (CRLF vs LF).
-#[cfg_attr(windows, ignore)]
#[rstest]
fn test_for_each_multiple_worktrees(mut repo: TestRepo) {
// Create additional worktrees
@@ -40,8 +36,6 @@ fn test_for_each_multiple_worktrees(mut repo: TestRepo) {
);
}
-/// Skipped on Windows: git show error messages may differ.
-#[cfg_attr(windows, ignore)]
#[rstest]
fn test_for_each_command_fails_in_one(mut repo: TestRepo) {
repo.add_worktree("feature");
@@ -60,8 +54,6 @@ fn test_for_each_no_args_error(repo: TestRepo) {
snapshot_for_each("for_each_no_args", &repo, &["for-each"]);
}
-/// Skipped on Windows: git status shows line-ending differences (CRLF vs LF).
-#[cfg_attr(windows, ignore)]
#[rstest]
fn test_for_each_with_detached_head(mut repo: TestRepo) {
// Create a worktree and detach its HEAD
@@ -75,8 +67,6 @@ fn test_for_each_with_detached_head(mut repo: TestRepo) {
);
}
-/// Skipped on Windows: `echo` command has different quoting behavior.
-#[cfg_attr(windows, ignore)]
#[rstest]
fn test_for_each_with_template(repo: TestRepo) {
// Test template expansion with {{ branch }}
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index a8abb73d2..98c298e4a 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -1650,8 +1650,8 @@ fn test_merge_no_commit_with_clean_tree(mut repo_with_feature_worktree: TestRepo
----- stdout -----
----- stderr -----
- 🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-   * 3cf9bf5 Add feature file
+ 🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+   * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
@@ -1711,8 +1711,8 @@ fn test_merge_no_commit_no_squash_no_remove_redundant(mut repo_with_feature_work
----- stdout -----
----- stderr -----
- 🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-   * 3cf9bf5 Add feature file
+ 🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+   * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
index 945f7a569..fc304de2f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
@@ -4,7 +4,7 @@ expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Path Remote⇅ Com│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> @ main ^ . 2..│
+> @ main ^ . a..│
│⚪ main has no uncommitted changes
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap
index 6c8bee8d2..67e6e5cde 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_log.snap
@@ -5,12 +5,12 @@ expression: normalized
> [QUERY] │[PREVIEW_HEADER]
Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> + feature ↑ ↑5 ./repo.feature ..│
- │* d2cf233 1d (feature) Add file 5 with important changes
- │* 996c924 1d Add file 4 with important changes
- │* a2eefed 1d Add file 3 with important changes
- │* 1c1106b 1d Add file 2 with important changes
- │* 0602185 1d Add file 1 with important changes
- │* 23e5a15 1d Initial commit
+ │* 4ac610b 1d (feature) Add file 5 with important changes
+ │* f68805a 1d Add file 4 with important changes
+ │* ae793ef 1d Add file 3 with important changes
+ │* 258fa75 1d Add file 2 with important changes
+ │* d3b6cb8 1d Add file 1 with important changes
+ │* a1e809f 1d Initial commit
│
│
│
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index d1488dc9a..fb24f91fd 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
@@ -8,6 +8,7 @@ info:
- main
- "--no-remove"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -15,18 +16,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
index 2dc2b651c..35a74acd2 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
@@ -30,8 +30,8 @@ exit_code: 0
Set-Location '[PATH]'
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 8e8b55827..55f4c0436 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
@@ -7,6 +7,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -25,8 +30,8 @@ exit_code: 0
cd '[PATH]'
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap
index 6ee9473e0..b813f0907 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
@@ -10,6 +10,7 @@ info:
- status
- "--short"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -17,10 +18,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -28,6 +33,5 @@ exit_code: 0
----- stderr -----
🔄 Running in main...
-warning: untracked cache is disabled on this system or location
✅ Completed in 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap
index e48369e18..d574a664a 100644
--- a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap
+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap
@@ -10,6 +10,7 @@ info:
- status
- "--short"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -17,10 +18,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -28,7 +33,6 @@ exit_code: 0
----- stderr -----
🔄 Running in main...
-warning: untracked cache is disabled on this system or location
🔄 Running in (detached)...
✅ Completed in 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
index 7d18aed71..092c163c2 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
@@ -6,6 +6,7 @@ info:
- "--internal"
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,6 +29,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index 953ab9845..8a5d85208 100644
--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
@@ -6,6 +6,7 @@ info:
- list
- "--branches"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,7 +29,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
- branch-only /_ 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
+ branch-only /_ a1e809f5 1d Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
index 182782cc5..6976b7f03 100644
--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ⚑^ . 23e5a150 1d Initial commit
+@ develop ⚑^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 08611ae05..263c53b8e 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ⚑^ . 23e5a150 1d Initial commit
+@ - ⚑^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
index 392272f7e..8fea10004 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ - ⚑_ ./repo.feature 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ - ⚑_ ./repo.feature a1e809f5 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
index f437a07a3..06eceb4ca 100644
--- a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
@@ -6,6 +6,7 @@ info:
- list
- "--format=json"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -27,8 +32,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "ede2fd3bb9c1e19c7b803c11c0648d0b6d335ea2",
- "short_sha": "ede2fd3",
+ "sha": "33c3e5aa9f928d3eab87da8cbcd187e2ab921064",
+ "short_sha": "33c3e5a",
"message": "Same content on main",
"timestamp": 0
},
@@ -62,8 +67,8 @@ exit_code: 0
"path": "[REPO].feature-merged",
"kind": "worktree",
"commit": {
- "sha": "034aef5b37347d10e770bb86865c148124ff8546",
- "short_sha": "034aef5",
+ "sha": "ee45656141f6f30e6e036767adf380b3ccc639d7",
+ "short_sha": "ee45656",
"message": "Merge main into feature",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
index a3e5cd189..9399a1885 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
@@ -6,6 +6,7 @@ info:
- list
- "--format=json"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -27,8 +32,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "2c97a38e97cba7ea1d95d6c8b948b0cf5199fc79",
- "short_sha": "2c97a38",
+ "sha": "4803e9416c19681b83017135ac3a8c1b04898868",
+ "short_sha": "4803e94",
"message": "Main commit 2",
"timestamp": 0
},
@@ -62,8 +67,8 @@ exit_code: 0
"path": "[REPO].feature-ahead",
"kind": "worktree",
"commit": {
- "sha": "13797c6a6136f965d1186fdb1f4fa2de2707df6d",
- "short_sha": "13797c6",
+ "sha": "1080181c245695ed0d64aba6b0b0b7c0bfff9530",
+ "short_sha": "1080181",
"message": "Feature commit 2",
"timestamp": 0
},
@@ -96,8 +101,8 @@ exit_code: 0
"path": "[REPO].feature-behind",
"kind": "worktree",
"commit": {
- "sha": "98ef56c1ce6de2d5c942729c2be35461c4441a8a",
- "short_sha": "98ef56c",
+ "sha": "b8b9f4453f95a585105de3ae3439d8017dee67f3",
+ "short_sha": "b8b9f44",
"message": "Initial commit on main",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
index fca5e1dbd..252906477 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
@@ -6,6 +6,7 @@ info:
- list
- "--format=json"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -27,8 +32,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "3109da74e45839c90409a6e4774cdf0bae50a284",
- "short_sha": "3109da7",
+ "sha": "33244e69fc0c568ce7cffd49b04c9c89ffb22510",
+ "short_sha": "33244e6",
"message": "Main conflicting changes",
"timestamp": 0
},
@@ -62,8 +67,8 @@ exit_code: 0
"path": "[REPO].feature",
"kind": "worktree",
"commit": {
- "sha": "3109da74e45839c90409a6e4774cdf0bae50a284",
- "short_sha": "3109da7",
+ "sha": "33244e69fc0c568ce7cffd49b04c9c89ffb22510",
+ "short_sha": "33244e6",
"message": "Main conflicting changes",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index 605e996d4..f10398f91 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -6,6 +6,7 @@ info:
- list
- "--format=json"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -27,8 +32,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",
- "short_sha": "23e5a15",
+ "sha": "a1e809f511b21ee516412a4520497f0cea4af366",
+ "short_sha": "a1e809f",
"message": "Initial commit",
"timestamp": 0
},
@@ -62,8 +67,8 @@ exit_code: 0
"path": "[REPO].feature-detached",
"kind": "worktree",
"commit": {
- "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",
- "short_sha": "23e5a15",
+ "sha": "a1e809f511b21ee516412a4520497f0cea4af366",
+ "short_sha": "a1e809f",
"message": "Initial commit",
"timestamp": 0
},
@@ -100,8 +105,8 @@ exit_code: 0
"path": "[REPO].locked-feature",
"kind": "worktree",
"commit": {
- "sha": "23e5a15006b67068f23d976a978dfffdb68e5fda",
- "short_sha": "23e5a15",
+ "sha": "a1e809f511b21ee516412a4520497f0cea4af366",
+ "short_sha": "a1e809f",
"message": "Initial commit",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
index 0ad2fd53c..34a4618a7 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
@@ -6,6 +6,7 @@ info:
- list
- "--format=json"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -27,8 +32,8 @@ exit_code: 0
"path": "[REPO]",
"kind": "worktree",
"commit": {
- "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",
- "short_sha": "002eabd",
+ "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",
+ "short_sha": "a058e79",
"message": "Initial commit",
"timestamp": 0
},
@@ -62,8 +67,8 @@ exit_code: 0
"path": "[REPO].with-status",
"kind": "worktree",
"commit": {
- "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",
- "short_sha": "002eabd",
+ "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",
+ "short_sha": "a058e79",
"message": "Initial commit",
"timestamp": 0
},
@@ -100,8 +105,8 @@ exit_code: 0
"path": "[REPO].without-status",
"kind": "worktree",
"commit": {
- "sha": "002eabd05071bde2c6e208e9a392e0943eee584d",
- "short_sha": "002eabd",
+ "sha": "a058e792cfd4836c913fdbc0d4559af34b352b07",
+ "short_sha": "a058e79",
"message": "Initial commit",
"timestamp": 0
},
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index db096e556..a3e59526e 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged b5af29ef 1d Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes c22cc0ea 1d Add 100 lines
-+ fix ? _ 💬 ./repo.fix 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 46a695800..4950bd81a 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,10 +28,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ./repo.feature-current 0a3c2673 23h Commit at 01:00
-^ main ^ ./repo 98ef56c1 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest fecd7fba 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle b3bdc202 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest 4e1d6a2d 23h Commit at 00:30
+@ feature-current ↑ ↑1 ./repo.feature-current 431987e2 23h Commit at 01:00
+^ main ^ ./repo 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
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
index 60624189c..1da4d8ddf 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,8 +28,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ⚑^ ./repo 23e5a150 1d Initial commit
-+ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
-+ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
+@ develop ⚑^ ./repo a1e809f5 1d Initial commit
++ feature-a _ ./repo.feature-a a1e809f5 1d Initial commit
++ feature-b _ ./repo.feature-b a1e809f5 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index e3ab2ad0c..60a927dd0 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
@@ -19,8 +19,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
-+ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ feature-a _ ./repo.feature-a a1e809f5 1d Initial commit
++ feature-b _ ./repo.feature-b a1e809f5 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index cb9d3efb4..30e6e1239 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ locked-no-reason ⊞_ ./repo.locked-no-reason 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ locked-no-reason ⊞_ ./repo.locked-no-reason a1e809f5 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index 799565930..97baaec75 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ locked-feature ⊞_ ./repo.locked-feature 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ locked-feature ⊞_ ./repo.locked-feature a1e809f5 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index a9c978c71..eca9bff5a 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo e255c04f 1d Short message
-+ feature-a ⊂ ↓1 ./repo.feature-a 706db1c1 1d This is a very long commit message that should test how the…
+@ main ^ ./repo c80da958 1d Short message
++ feature-a ⊂ ↓1 ./repo.feature-a 0fcd1a46 1d This is a very long commit message that should test how the…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
index 1ab8f6dd0..56248326e 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,10 +28,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ medium-name _ ./repo.medium-name 23e5a150 1d Initial commit
-+ short _ ./repo.short 23e5a150 1d Initial commit
-+ very-long-branch-name-here _ ./repo.very-long-branch-name-here 23e5a150 1d Initial commit
-+ with-changes _ ./repo.with-changes 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 2f9dd0294..cb547af64 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -29,7 +29,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./repo ⇡1 7bfbaf47 1d Main advances
-+ feature +!?⊞✗⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 63aaaeb2 1d Local commit
+@ main ^⇡ ./repo ⇡1 9dd6c628 1d Main advances
++ feature +!?⊞✗⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 88205002 1d Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index 9af7e54db..3bb2c71f8 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
@@ -29,7 +29,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo 966ac172 1d Main conflicting changes
-+ feature +!?✘ 🤖 +7 ./repo.feature 966ac172 1d Main conflicting changes
+@ main ^ ./repo 1c3b3fec 1d Main conflicting changes
++ feature +!?✘ 🤖 +7 ./repo.feature 1c3b3fec 1d Main conflicting changes
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index 50184e079..558f97e62 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature +!? ↑ +2 -3 ↑1 ./repo.feature beeae57b 1d Add files
+@ main ^ ./repo a1e809f5 1d Initial commit
++ feature +!? ↑ +2 -3 ↑1 ./repo.feature 095602ce 1d Add files
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index e5f2d90b5..c0c3dbaf7 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,8 +28,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
-+ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ feature-a _ ./repo.feature-a a1e809f5 1d Initial commit
++ feature-b _ ./repo.feature-b a1e809f5 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
index de1949f9f..4c73c656e 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -6,6 +6,7 @@ info:
- list
- "--no-progressive"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,7 +29,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature _ ./repo.feature 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ feature _ ./repo.feature a1e809f5 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
index b674e7a59..9f32a05d6 100644
--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-- feature _ ./repo.feature 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
+- feature _ ./repo.feature a1e809f5 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
index ca9182abd..7de6440b7 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -6,6 +6,7 @@ info:
- list
- "--progressive"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,8 +29,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
-+ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ feature-a _ ./repo.feature-a a1e809f5 1d Initial commit
++ feature-b _ ./repo.feature-b a1e809f5 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index 85a530581..6dcf0f753 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -7,6 +7,7 @@ info:
- "--progressive"
- "--branches"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -25,9 +30,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
- orphan-1 /_ 23e5a150 1d Initial commit
- orphan-2 /_ 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
index d5db0e947..648b834e4 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "115"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,8 +28,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 d35485d7 30m Add API tests
-^ main ^⇅ ./repo ⇡1 ⇣1 e18e1b4d 4d Merge fix-auth:…
-+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 2517d700 5h Add secure token…
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 ec97decc 30m Add API tests
+^ main ^⇅ ./repo ⇡1 ⇣1 6088adb3 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 127407de 5h Add secure token…
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index 8f6f2f0c5..35df6f87c 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
@@ -30,10 +30,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● d35485d7 30m
-^ main ^⇅ ./repo ⇡1 ⇣1 ● e18e1b4d 4d
-+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 2517d700 5h
- exp /↕ ↑2 ↓1 +137 52cad122 2d
- wip /↕ ↑1 ↓1 +33 7ca6d817 3d
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● ec97decc 30m
+^ main ^⇅ ./repo ⇡1 ⇣1 ● 6088adb3 4d
++ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 127407de 5h
+ exp /↕ ↑2 ↓1 +137 99e114de 2d
+ wip /↕ ↑1 ↓1 +33 d62fd0e8 3d
⚪ 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 895937a26..64aad8b6c 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
@@ -29,8 +29,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● d35485d7 30m
-^ main ^⇅ ./repo ⇡1 ⇣1 ● e18e1b4d 4d
-+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 2517d700 5h
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● ec97decc 30m
+^ main ^⇅ ./repo ⇡1 ⇣1 ● 6088adb3 4d
++ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 127407de 5h
⚪ Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index e36bb8a39..68026737e 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index 50d29e5b6..91aa24f9f 100644
--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 8640e085 1d Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./repo.pr-link e276c9d3 1d PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence 9bb9b94c 1d Initial content
+@ main ^ ./repo 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
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
index 06a70c5f3..e639f1dc2 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
@@ -6,6 +6,7 @@ info:
- list
- "--progressive"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,6 +29,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ⚑^ . 23e5a150 1d Initial commit
+@ - ⚑^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
index c004c4a0c..529b7b5d4 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
@@ -30,8 +30,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-a ? _ ./repo.feature-a 23e5a150 1d Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./repo.feature-b a1aff845 1d Test commit
+@ main ^ ./repo 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
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
index efc4a669f..c763d0d3a 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
@@ -6,6 +6,7 @@ info:
- list
- "--progressive"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,16 +29,16 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-1 _ ./repo.feature-1 23e5a150 1d Initial commit
-+ feature-10 _ ./repo.feature-10 23e5a150 1d Initial commit
-+ feature-2 _ ./repo.feature-2 23e5a150 1d Initial commit
-+ feature-3 _ ./repo.feature-3 23e5a150 1d Initial commit
-+ feature-4 _ ./repo.feature-4 23e5a150 1d Initial commit
-+ feature-5 _ ./repo.feature-5 23e5a150 1d Initial commit
-+ feature-6 _ ./repo.feature-6 23e5a150 1d Initial commit
-+ feature-7 _ ./repo.feature-7 23e5a150 1d Initial commit
-+ feature-8 _ ./repo.feature-8 23e5a150 1d Initial commit
-+ feature-9 _ ./repo.feature-9 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 11 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
index 86dfa7cc4..af301d0fa 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
@@ -6,6 +6,7 @@ info:
- list
- "--progressive"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,9 +29,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
-+ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
-+ feature-c _ ./repo.feature-c 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index aad852715..f51154293 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
@@ -6,6 +6,7 @@ info:
- list
- "--progressive"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,10 +29,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ./repo.feature-current 0a3c2673 23h Commit at 01:00
-^ main ^ ./repo 98ef56c1 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest fecd7fba 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle b3bdc202 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest 4e1d6a2d 23h Commit at 00:30
+@ feature-current ↑ ↑1 ./repo.feature-current 431987e2 23h Commit at 01:00
+^ main ^ ./repo 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
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
index 1c56736aa..70649ec0c 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
@@ -6,6 +6,7 @@ info:
- list
- "--progressive"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,6 +29,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
index 438f649f9..77104daed 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
@@ -6,6 +6,7 @@ info:
- list
- "--progressive"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,8 +29,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ locked ⊞_ ./repo.locked 23e5a150 1d Initial commit
-+ normal _ ./repo.normal 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ locked ⊞_ ./repo.locked a1e809f5 1d Initial commit
++ normal _ ./repo.normal a1e809f5 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index 4a73fc2fd..ee93e8d3c 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -30,8 +30,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^| ./repo | 98ef56c1 1d Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 52e3cac0 1d Ahead commit
-+ in-sync _| ./repo.in-sync | 98ef56c1 1d Initial commit on main
+@ main ^| ./repo | 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
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index ebc4e6560..9f72625ac 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 6129b674 1d Fix bug with café ☕ handling
-+ feature-test ⊂ ↓1 ./repo.feature-test 18096b4b 1d Add support for 日本語 and émoji 🎉
+@ main ^ ./repo d167d3cc 1d Fix bug with café ☕ handling
++ feature-test ⊂ ↓1 ./repo.feature-test 96b95eab 1d Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
index 26fe270a4..741c303a0 100644
--- a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,8 +28,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ emoji _ 🔄 ./repo.emoji 23e5a150 1d Initial commit
-+ multi _ 👨‍💻 ./repo.multi 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ emoji _ 🔄 ./repo.emoji a1e809f5 1d Initial commit
++ multi _ 👨‍💻 ./repo.multi a1e809f5 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index 4e0aca8a1..63d37a565 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -6,6 +6,7 @@ info:
- list
- "--branches"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,10 +29,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree 23e5a150 1d Initial commit
- another-branch /_ 23e5a150 1d Initial commit
- feature-without-worktree /_ 23e5a150 1d Initial commit
- fix-bug /_ 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 2 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
index 325c54884..e72e0e736 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
@@ -6,6 +6,7 @@ info:
- list
- "--branches"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,8 +29,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-a _ ./repo.feature-a 23e5a150 1d Initial commit
-+ feature-b _ ./repo.feature-b 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ feature-a _ ./repo.feature-a a1e809f5 1d Initial commit
++ feature-b _ ./repo.feature-b a1e809f5 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
index d7cd9fcbe..7601670cf 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
@@ -6,6 +6,7 @@ info:
- list
- "--branches"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,9 +29,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
- branch-alpha /_ 23e5a150 1d Initial commit
- branch-beta /_ 23e5a150 1d Initial commit
- branch-gamma /_ 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
+ branch-alpha /_ a1e809f5 1d Initial commit
+ branch-beta /_ a1e809f5 1d Initial commit
+ branch-gamma /_ a1e809f5 1d Initial commit
⚪ Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index 2181bbecb..d765691d8 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
- "--remotes"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -25,10 +30,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| . | 23e5a150 1d Initial commit
- local-only-1 /_ 23e5a150 1d Initial commit
- local-only-2 /_ 23e5a150 1d Initial commit
- origin/remote-only-1 /_ 23e5a150 1d Initial commit
- origin/remote-only-2 /_ 23e5a150 1d Initial commit
+@ 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
⚪ Showing 1 worktrees, 2 branches, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index d06c551a9..fdf815ff7 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -6,6 +6,7 @@ info:
- list
- "--remotes"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,8 +29,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| ./repo | 23e5a150 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree 23e5a150 1d Initial commit
- origin/remote-only /_ 23e5a150 1d Initial commit
+@ main ^| ./repo | a1e809f5 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree a1e809f5 1d Initial commit
+ origin/remote-only /_ a1e809f5 1d Initial commit
⚪ Showing 2 worktrees, 1 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index 05cc96876..863aab31f 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -6,6 +6,7 @@ info:
- list
- "--remotes"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,8 +29,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^| . | 23e5a150 1d Initial commit
- origin/remote-feature-1 /_ 23e5a150 1d Initial commit
- origin/remote-feature-2 /_ 23e5a150 1d Initial commit
+@ main ^| . | a1e809f5 1d Initial commit
+ origin/remote-feature-1 /_ a1e809f5 1d Initial commit
+ origin/remote-feature-2 /_ a1e809f5 1d Initial commit
⚪ Showing 1 worktrees, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 2f6a5d08a..5ed88e815 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
- "--full"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,11 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -26,11 +30,11 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^| ./repo | 98ef56c1 1d Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 a7df60e1 1d Ahead commit 2
-+ behind _⇣ ./repo.behind ⇣1 98ef56c1 1d Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 26606aa3 1d Diverged local commit
-+ in-sync _| ./repo.in-sync | 98ef56c1 1d Initial commit on main
-+ no-upstream _ ./repo.no-upstream 98ef56c1 1d Initial commit on main
+@ main ^| ./repo | 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
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
index 9cce272e7..3defb4e40 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 002eabd0 1d Initial commit
-+ feature-api ↑ 🤖 ↑1 ./repo.feature-api 2f045483 1d Add REST API endpoints
-+ review-ui ? ↑ 💬 ↑1 ./repo.review-ui b8c11f99 1d Add dashboard component
-+ wip-docs ? _ ./repo.wip-docs 002eabd0 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 4 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
index 07c35bbf6..3e01b8759 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
@@ -28,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ test !? ↑ +1 -1 ↑1 ./repo.test 34f7b918 1d Test
+@ main ^ ./repo a1e809f5 1d Initial commit
++ test !? ↑ +1 -1 ↑1 ./repo.test 689d5d16 1d Test
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
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 b3744bf13..85ecaa369 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
@@ -28,8 +28,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ complex + ? ↑ +1 -1 ↑1 ./repo.complex a9d67c29 1d Complex
-+ simple ? ↑ ↑1 ./repo.simple 9ce20ca0 1d Simple
+@ main ^ ./repo a1e809f5 1d Initial commit
++ complex + ? ↑ +1 -1 ↑1 ./repo.complex 42162296 1d Complex
++ simple ? ↑ ↑1 ./repo.simple 63ee5cb5 1d Simple
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
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 639e45e5a..70c34368c 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
@@ -16,6 +16,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -27,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
index cc8ac121c..ed8ea46fb 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
@@ -17,6 +17,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -28,7 +29,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
- feature /_ 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
+ feature /_ a1e809f5 1d Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
index 639e45e5a..70c34368c 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
@@ -16,6 +16,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -27,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
index 639e45e5a..70c34368c 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
@@ -16,6 +16,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -27,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
index 639e45e5a..70c34368c 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
@@ -16,6 +16,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -27,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index 32fe40095..2e117d771 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
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,12 +29,12 @@ exit_code: 0
----- stderr -----
🔄 Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-💡 Backup created @ e997a6b
+💡 Backup created @ 14fc72d
🔄 Generating squash commit message...
  fix: update file 1 content
-✅ Squashed @ 735173c
-🔄 Merging 1 commit to main @ 735173c (no rebase needed)
-  * 735173c fix: update file 1 content
+✅ Squashed @ f1c474c
+🔄 Merging 1 commit to main @ f1c474c (no rebase needed)
+  * f1c474c fix: update file 1 content
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 29f6d34d3..4f2d52a2f 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
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,16 +29,16 @@ exit_code: 0
----- stderr -----
🔄 Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-💡 Backup created @ 0b230e0
+💡 Backup created @ 183cc8b
🔄 Generating squash commit message...
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: initial feature
-✅ Squashed @ 760ba6d
-🔄 Merging 1 commit to main @ 760ba6d (no rebase needed)
-  * 760ba6d Squash commits from main
+✅ Squashed @ d3582c0
+🔄 Merging 1 commit to main @ d3582c0 (no rebase needed)
+  * d3582c0 Squash commits from main
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index 3584c4622..03b91b445 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
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -24,12 +29,12 @@ exit_code: 0
----- stderr -----
🔄 Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-💡 Backup created @ 174c6c4
+💡 Backup created @ 5e120d3
🔄 Generating squash commit message...
  fix: improve auth validation logic
-✅ Squashed @ 0b55555
-🔄 Merging 1 commit to main @ 0b55555 (no rebase needed)
-  * 0b55555 fix: improve auth validation logic
+✅ Squashed @ 88fed03
+🔄 Merging 1 commit to main @ 88fed03 (no rebase needed)
+  * 88fed03 fix: improve auth validation logic
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index dca532455..04cc468b2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -28,9 +33,9 @@ exit_code: 0
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to dirty.txt
-✅ Committed changes @ a73fb89
-🔄 Merging 1 commit to main @ a73fb89 (no rebase needed)
-  * a73fb89 Changes to dirty.txt
+✅ Committed changes @ b44b09f
+🔄 Merging 1 commit to main @ b44b09f (no rebase needed)
+  * b44b09f Changes to dirty.txt
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index a855e45c5..05d43b5a7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
index 551671133..5e5e6fdf0 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
@@ -8,6 +8,7 @@ info:
- "--no-commit"
- "--no-remove"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -15,10 +16,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: false
exit_code: 1
@@ -26,6 +31,6 @@ exit_code: 1
----- stderr -----
❌ Can't push to local main branch: it has newer commits
-  * fd8f601 Add main file
+  * 1b32c68 Add main file
💡 Run wt merge again to incorporate these changes
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index adad00483..8fd4cc8d3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -28,9 +33,9 @@ exit_code: 0
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to newfile.txt
-✅ Committed changes @ 4b94530
-🔄 Merging 1 commit to main @ 4b94530 (no rebase needed)
-  * 4b94530 Changes to newfile.txt
+✅ Committed changes @ bbcee27
+🔄 Merging 1 commit to main @ bbcee27 (no rebase needed)
+  * bbcee27 Changes to newfile.txt
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index 924b8279c..52f94b4ea 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -5,6 +5,7 @@ info:
args:
- merge
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,18 +13,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index bb8c67a20..251657226 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -7,6 +7,7 @@ info:
- main
- "--no-squash"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,19 +15,23 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 2 commits to main @ 1c5f30c (no commit/squash/rebase needed)
-  * 1c5f30c feat: add file 2
-  * b795264 feat: add file 1
+🔄 Merging 2 commits to main @ f0d31ff (no commit/squash/rebase needed)
+  * f0d31ff feat: add file 2
+  * 65fe669 feat: add file 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 12da59f74..f6e699c6f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 83771b6 (no commit/squash/rebase needed)
-  * 83771b6 Add feature file
+🔄 Merging 1 commit to main @ 430212e (no commit/squash/rebase needed)
+  * 430212e Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index a91e12c1b..a84c4fd3a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -29,8 +29,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ b979f04 (no commit/squash/rebase needed)
-  * b979f04 Add feature file
+🔄 Merging 1 commit to main @ 623e1f1 (no commit/squash/rebase needed)
+  * 623e1f1 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index 7787a0efb..5bf8c8063 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -7,6 +7,7 @@ info:
- main
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,18 +15,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ f907cce (no commit/squash/rebase needed)
-  * f907cce Add feature file
+🔄 Merging 1 commit to main @ 40d535b (no commit/squash/rebase needed)
+  * 40d535b Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
index 2c5fbac3c..189110ca8 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
@@ -8,6 +8,7 @@ info:
- "--force"
- "--no-verify"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -15,18 +16,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ d553927 (no commit/squash/rebase needed)
-  * d553927 Add feature file
+🔄 Merging 1 commit to main @ 75e8546 (no commit/squash/rebase needed)
+  * 75e8546 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index cd3ddec62..62cf38f20 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -7,6 +7,7 @@ info:
- main
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,18 +15,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ d553927 (no commit/squash/rebase needed)
-  * d553927 Add feature file
+🔄 Merging 1 commit to main @ 75e8546 (no commit/squash/rebase needed)
+  * 75e8546 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index eb34b1eec..4aaea5531 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -7,6 +7,7 @@ info:
- main
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -32,9 +37,9 @@ exit_code: 0
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to feature.txt
-✅ Committed changes @ 544fecb
-🔄 Merging 1 commit to main @ 544fecb (no rebase needed)
-  * 544fecb Changes to feature.txt
+✅ Committed changes @ fce4243
+🔄 Merging 1 commit to main @ fce4243 (no rebase needed)
+  * fce4243 Changes to feature.txt
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index a16f647dd..503ed3034 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -7,6 +7,7 @@ info:
- main
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -30,8 +35,8 @@ exit_code: 0
  exit 0
🔄 Running project pre-merge test:
  exit 0
-🔄 Merging 1 commit to main @ 56c009e (no commit/squash/rebase needed)
-  * 56c009e Add feature file
+🔄 Merging 1 commit to main @ 4a48dbd (no commit/squash/rebase needed)
+  * 4a48dbd Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
index 005d5ef4d..3bb2ba0c3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
@@ -7,6 +7,7 @@ info:
- main
- "--no-verify"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,18 +15,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 959ea18 (no commit/squash/rebase needed)
-  * 959ea18 Add feature file
+🔄 Merging 1 commit to main @ a3a6eaf (no commit/squash/rebase needed)
+  * a3a6eaf Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index d1680437a..1b83da7ee 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -7,6 +7,7 @@ info:
- main
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -26,8 +31,8 @@ exit_code: 0
----- stderr -----
🔄 Running project pre-merge:
  exit 0
-🔄 Merging 1 commit to main @ 0ceef32 (no commit/squash/rebase needed)
-  * 0ceef32 Add feature file
+🔄 Merging 1 commit to main @ 4f5863f (no commit/squash/rebase needed)
+  * 4f5863f Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index e4c465f48..82259a8b9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -7,6 +7,7 @@ info:
- main
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -27,8 +32,8 @@ exit_code: 0
🔄 Running project pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
-🔄 Merging 1 commit to main @ d4561b9 (no commit/squash/rebase needed)
-  * d4561b9 Add feature file
+🔄 Merging 1 commit to main @ ef627f5 (no commit/squash/rebase needed)
+  * ef627f5 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index 42a964642..306a4aa1f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index b7182f913..2cd32f5eb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -25,8 +30,8 @@ exit_code: 0
----- stderr -----
🔄 Rebasing onto main...
✅ Rebased onto main
-🔄 Merging 1 commit to main @ 5a61dea (no commit/squash needed)
-  * 5a61dea Add feature file
+🔄 Merging 1 commit to main @ eadc502 (no commit/squash needed)
+  * eadc502 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index 44999e076..0c21149b2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
@@ -7,6 +7,7 @@ info:
- main
- "--no-remove"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,18 +15,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index 467cd096d..a34b96200 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: false
exit_code: 1
@@ -26,7 +31,7 @@ exit_code: 1
🔄 Rebasing onto main...
❌ Rebase onto main incomplete
  Rebasing (1/1)
-  error: could not apply e1cf9a1... Update shared.txt in feature
-  Could not apply e1cf9a1... # Update shared.txt in feature
+  error: could not apply bed6661... Update shared.txt in feature
+  Could not apply bed6661... # Update shared.txt in feature
  Auto-merging shared.txt
  CONFLICT (content): Merge conflict in shared.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
index 8464c5e9c..5e7d59821 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -25,8 +30,8 @@ exit_code: 0
----- stderr -----
🔄 Rebasing onto main...
✅ Rebased onto main
-🔄 Merging 1 commit to main @ 0bb882f (no commit/squash needed)
-  * 0bb882f Add feature
+🔄 Merging 1 commit to main @ a5e5492 (no commit/squash needed)
+  * a5e5492 Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index fba801031..172204103 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -32,9 +37,9 @@ exit_code: 0
  - feat: add file 1
  - fix: update logic
  - docs: update readme
-✅ Squashed @ dd1e5fd
-🔄 Merging 1 commit to main @ dd1e5fd (no rebase needed)
-  * dd1e5fd Squash commits from main
+✅ Squashed @ af8c227
+🔄 Merging 1 commit to main @ af8c227 (no rebase needed)
+  * af8c227 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  file3.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index d41c0cbdd..2af2a09f6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ e26db67 (no commit/squash/rebase needed)
-  * e26db67 feat: single commit
+🔄 Merging 1 commit to main @ c2e3582 (no commit/squash/rebase needed)
+  * c2e3582 feat: single commit
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 000bf7293..3d2a93a5b 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -26,9 +31,9 @@ exit_code: 0
🔄 Squashing 2 commits into a single commit (1 file, +1)...
🔄 Generating squash commit message...
  feat: implement user authentication system
-✅ Squashed @ a0c80b0
-🔄 Merging 1 commit to main @ a0c80b0 (no rebase needed)
-  * a0c80b0 feat: implement user authentication system
+✅ Squashed @ 785d1ff
+🔄 Merging 1 commit to main @ 785d1ff (no rebase needed)
+  * 785d1ff feat: implement user authentication system
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
index 3d36ff827..238a5c778 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
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,12 +14,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update files"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -26,12 +31,12 @@ exit_code: 0
----- stderr -----
🔄 Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-💡 Backup created @ e997a6b
+💡 Backup created @ 14fc72d
🔄 Generating squash commit message...
  fix: update files
-✅ Squashed @ 06dba69
-🔄 Merging 1 commit to main @ 06dba69 (no rebase needed)
-  * 06dba69 fix: update files
+✅ Squashed @ 257ac9f
+🔄 Merging 1 commit to main @ 257ac9f (no rebase needed)
+  * 257ac9f fix: update files
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 924b8279c..52f94b4ea 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -5,6 +5,7 @@ info:
args:
- merge
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,18 +13,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
index 247c1082e..07ec38673 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
@@ -6,6 +6,7 @@ info:
- merge
- staging
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -25,8 +30,8 @@ exit_code: 0
----- stderr -----
🔄 Rebasing onto staging...
✅ Rebased onto staging
-🔄 Merging 1 commit to staging @ 4240724 (no commit/squash needed)
-  * 4240724 Add feature for staging
+🔄 Merging 1 commit to staging @ 278a642 (no commit/squash needed)
+  * 278a642 Add feature for staging
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to staging (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
index a855e45c5..05d43b5a7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
index 9575725d5..d01870604 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -6,6 +6,7 @@ info:
- merge
- ^
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 44999e076..0c21149b2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -7,6 +7,7 @@ info:
- main
- "--no-remove"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,18 +15,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 3cf9bf5 (no commit/squash/rebase needed)
-  * 3cf9bf5 Add feature file
+🔄 Merging 1 commit to main @ fc12499 (no commit/squash/rebase needed)
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index a8ee1259d..db6981e9d 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
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,12 +14,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -29,12 +34,12 @@ exit_code: 0
  untracked1.txt
  untracked2.txt
🔄 Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
-💡 Backup created @ b8f4f9c
+💡 Backup created @ fefa700
🔄 Generating squash commit message...
  fix: commit changes
-✅ Squashed @ c785ba8
-🔄 Merging 1 commit to main @ c785ba8 (no rebase needed)
-  * c785ba8 fix: commit changes
+✅ Squashed @ 69f015f
+🔄 Merging 1 commit to main @ 69f015f (no rebase needed)
+  * 69f015f fix: commit changes
  file1.txt | 1 +
  untracked1.txt | 1 +
  untracked2.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index d00552112..fd5a90415 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -7,6 +7,7 @@ info:
- main
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,11 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -36,7 +40,7 @@ exit_code: 0
  - Implement token refresh mechanism with expiry handling
  - Add JWT encoding/decoding with signature verification
  - Create test suite covering all authentication flows
-✅ Squashed @ 25c560f
+✅ Squashed @ 85d3884
🔄 Running project pre-merge test:
  cargo test
 Finished test [unoptimized + debuginfo] target(s) in 0.12s
@@ -53,8 +57,8 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin
  cargo clippy
 Checking worktrunk v0.1.0
Finished dev [unoptimized + debuginfo] target(s) in 1.23s
-🔄 Merging 1 commit to main @ 25c560f (no rebase needed)
-  * 25c560f feat(auth): Implement JWT authentication system
+🔄 Merging 1 commit to main @ 85d3884 (no rebase needed)
+  * 85d3884 feat(auth): Implement JWT authentication system
  auth.rs | 8 ++++++++
  auth_test.rs | 17 +++++++++++++++++
  jwt.rs | 8 ++++++++
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
index 8df109c99..59321c438 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
@@ -7,6 +7,7 @@ info:
- main
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,11 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -31,7 +35,7 @@ exit_code: 0
 
  Implement login and token refresh endpoints with JWT validation.
  Includes comprehensive test coverage and input validation.
-✅ Squashed @ 34e674c
+✅ Squashed @ 7323bc5
🔄 Running project pre-merge test:
  uv run pytest
@@ -49,8 +53,8 @@ tests/test_auth.py::test_token_validation PASSED [100%]
All checks passed!
-🔄 Merging 1 commit to main @ 34e674c (no rebase needed)
-  * 34e674c feat(api): Add user authentication endpoints
+🔄 Merging 1 commit to main @ 7323bc5 (no rebase needed)
+  * 7323bc5 feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 2bd6a81ce..850bcf418 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -6,6 +6,7 @@ info:
- merge
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 0fc2285 (no commit/squash/rebase needed)
-  * 0fc2285 Implement JWT validation
+🔄 Merging 1 commit to main @ 8f777c3 (no commit/squash/rebase needed)
+  * 8f777c3 Implement JWT validation
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
✅ Merged to main (1 commit, 1 file, +13)
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
index 8b56d2d0e..2e68bfac5 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
@@ -8,6 +8,7 @@ info:
- "--no-verify"
- "--stage=tracked"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -15,12 +16,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -30,4 +35,4 @@ exit_code: 0
⚪ Skipping pre-commit hooks (--no-verify)
🔄 Generating commit message and committing tracked changes... (1 file, +1, -1)
  fix: update file
-✅ Committed changes @ 720fda9
+✅ Committed changes @ b92c41b
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
index 6b209e0b1..009104392 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
@@ -7,6 +7,7 @@ info:
- commit
- "--no-verify"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,12 +15,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "feat: add file"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -32,4 +37,4 @@ exit_code: 0
  file1.txt
🔄 Generating commit message and committing changes... (2 files, +2)
  feat: add file
-✅ Committed changes @ f8c8262
+✅ Committed changes @ 388183d
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
index 324e00b86..fc8d4eb78 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
@@ -7,6 +7,7 @@ info:
- commit
- "--stage=tracked"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,12 +15,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update tracked file"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -28,4 +33,4 @@ exit_code: 0
----- stderr -----
🔄 Generating commit message and committing tracked changes... (1 file, +1, -1)
  fix: update tracked file
-✅ Committed changes @ e6cf891
+✅ Committed changes @ 0495397
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
index cec3889e7..8a4462b1a 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
@@ -8,6 +8,7 @@ info:
- "--no-verify"
- "--stage=tracked"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -15,12 +16,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -29,7 +34,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 @ 209c929
+💡 Backup created @ ef0df66
🔄 Generating squash commit message...
  squash: combined commits
-✅ Squashed @ 08bd578
+✅ Squashed @ 3c1afb6
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
index da560a21e..76ab7c15c 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
@@ -7,6 +7,7 @@ info:
- squash
- "--no-verify"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,12 +15,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -30,4 +35,4 @@ exit_code: 0
🔄 Squashing 2 commits into a single commit (3 files, +3)...
🔄 Generating squash commit message...
  squash: combined commits
-✅ Squashed @ 0c65059
+✅ Squashed @ fc99904
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
index 770669817..a81cc839f 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
@@ -7,6 +7,7 @@ info:
- squash
- "--stage=tracked"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,12 +15,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -27,7 +32,7 @@ exit_code: 0
----- stderr -----
🔄 Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
-💡 Backup created @ b7407a4
+💡 Backup created @ 6aa1805
🔄 Generating squash commit message...
  squash: combined commits
-✅ Squashed @ d5e34f6
+✅ Squashed @ 7335b29
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 8ad99536e..39f687218 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
@@ -8,6 +8,7 @@ info:
- feature
- "--force"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -18,9 +19,11 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -28,9 +31,9 @@ exit_code: 0
----- stderr -----
🔄 Running project post-create commit:
-  echo 'Commit: 549b3f44d1c4dfb3c7a36090fda2db14ff8b90df' > git_vars.txt
+  echo 'Commit: 5caad75ed9319b7bd5c35c626d7051d252f987e7' > git_vars.txt
🔄 Running project post-create short:
-  echo 'Short: 549b3f4' >> git_vars.txt
+  echo 'Short: 5caad75' >> git_vars.txt
🔄 Running project post-create remote:
  echo 'Remote: origin' >> git_vars.txt
🔄 Running project post-create worktree_name:
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
index 7b3f6c106..12e044799 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
@@ -7,6 +7,7 @@ info:
- push
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -25,8 +30,8 @@ exit_code: 0
----- stderr -----
🔄 Stashing changes in [REPO]...
-🔄 Pushing 1 commit to main @ 3cf9bf5
-  * 3cf9bf5 Add feature file
+🔄 Pushing 1 commit to main @ fc12499
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
🔄 Restoring stashed changes in [REPO]...
diff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
index 4349a650d..703da3c4c 100644
--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
@@ -7,6 +7,7 @@ info:
- push
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: false
exit_code: 1
@@ -25,6 +30,6 @@ exit_code: 1
----- stderr -----
❌ Can't push to local main branch: it has newer commits
-  * 26e1582 Main commit
+  * 54bc2d7 Main commit
💡 Use wt step rebase or wt merge to rebase onto main
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 240c042b2..4a7c2b135 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -7,6 +7,7 @@ info:
- push
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,18 +15,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 23fcc89
-  * 23fcc89 Add test file
+🔄 Pushing 1 commit to main @ e26c61d
+  * e26c61d Add test file
  test.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
index 49f387a7b..a5782f71b 100644
--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
@@ -6,6 +6,7 @@ info:
- step
- push
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 3cf9bf5
-  * 3cf9bf5 Add feature file
+🔄 Pushing 1 commit to main @ fc12499
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index 2a2181389..35b0c1c31 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -7,6 +7,7 @@ info:
- push
- main
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,18 +15,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 83771b6
-  * 83771b6 Add feature file
+🔄 Pushing 1 commit to main @ 430212e
+  * 430212e Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index 49f387a7b..a5782f71b 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -6,6 +6,7 @@ info:
- step
- push
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,18 +14,22 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 3cf9bf5
-  * 3cf9bf5 Add feature file
+🔄 Pushing 1 commit to main @ fc12499
+  * fc12499 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index fe0f49b2b..6cb665dbb 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
@@ -8,6 +8,7 @@ info:
- main
- "--allow-merge-commits"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -15,22 +16,26 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 3 commits to main @ 519f364 (merge commits allowed)
-  * 519f364 Merge temp
+🔄 Pushing 3 commits to main @ 2489484 (merge commits allowed)
+  * 2489484 Merge temp
  |/
-  | * 37cd3fe Commit 2
+  | * e03c938 Commit 2
  |/
-  * ac37628 Commit 1
+  * 9ca7ddd Commit 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
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 5c5f030ba..75e195336 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,7 +28,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo ecfb1c3a 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature _ ./repo.feature ecfb1c3a 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+@ main ^ ./repo 85d55864 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature _ ./repo.feature 85d55864 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
index ba1b2ec21..d50183ffc 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,6 +28,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . 23e5a150 1d Initial commit
+@ main ^ . a1e809f5 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
index 2b40e6dfa..85c260d4f 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ also-no-changes _ ./repo.also-no-changes 23e5a150 1d Initial commit
-+ no-changes _ ./repo.no-changes 23e5a150 1d Initial commit
-+ with-changes ! +1 -1 ./repo.with-changes 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 4 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
index b7895b539..559bd87de 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,8 +28,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ huge ? _ ./repo.huge 23e5a150 1d Initial commit
-+ tiny ! +1 -1 ./repo.tiny 23e5a150 1d Initial commit
+@ main ^ ./repo a1e809f5 1d Initial commit
++ huge ? _ ./repo.huge a1e809f5 1d Initial commit
++ tiny ! +1 -1 ./repo.tiny a1e809f5 1d Initial commit
⚪ Showing 3 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
index 053da7d47..9a9519a8c 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ feature-large ? _ ./repo.feature-large 23e5a150 1d Initial commit
-+ feature-medium ? _ ./repo.feature-medium 23e5a150 1d Initial commit
-+ feature-small ? _ ./repo.feature-small 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
index 1efb3830e..7e92c4209 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./repo 23e5a150 1d
-+ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here 23e5a150 1d
-+ short _ ./repo.short 23e5a150 1d
-+ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name 23e5a150 1d
+@ main ^ ./repo a1e809f5 1d
++ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here a1e809f5 1d
++ short _ ./repo.short a1e809f5 1d
++ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name a1e809f5 1d
⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
index e11a03c4b..71730a40a 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^ 23e5a150 1d Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues _ 23e5a150 1d Initial commit
-+ medium _ 23e5a150 1d Initial commit
-+ x _ 23e5a150 1d Initial commit
+@ main ^ a1e809f5 1d Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues _ a1e809f5 1d Initial commit
++ medium _ a1e809f5 1d Initial commit
++ x _ a1e809f5 1d Initial commit
⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
index 7e1cc249a..265b7530e 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ a _ ./repo.a 23e5a150 1d Initial commit
-+ bb _ ./repo.bb 23e5a150 1d Initial commit
-+ ccc _ ./repo.ccc 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index 98705e387..e17850968 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
@@ -5,6 +5,7 @@ info:
args:
- list
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -12,10 +13,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -23,9 +28,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 23e5a150 1d Initial commit
-+ cafe _ ./repo.cafe 23e5a150 1d Initial commit
-+ naive _ ./repo.naive 23e5a150 1d Initial commit
-+ resume _ ./repo.resume 23e5a150 1d Initial commit
+@ main ^ ./repo 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
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap
index d45752288..36b982425 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap
@@ -30,8 +30,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 90f2330 (no commit/squash/rebase needed)
-  * 90f2330 Add feature
+🔄 Merging 1 commit to main @ d233817 (no commit/squash/rebase needed)
+  * d233817 Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
index 74c2f13c9..dab841df3 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap
@@ -8,6 +8,7 @@ info:
- "--force"
- "--no-remove"
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -15,10 +16,14 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
@@ -32,9 +37,9 @@ exit_code: 0
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to uncommitted.txt
-✅ Committed changes @ 234d7f9
-🔄 Merging 1 commit to main @ 234d7f9 (no rebase needed)
-  * 234d7f9 Changes to uncommitted.txt
+✅ Committed changes @ fc0fed2
+🔄 Merging 1 commit to main @ fc0fed2 (no rebase needed)
+  * fc0fed2 Changes to uncommitted.txt
  uncommitted.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap
index 6349c4dac..8dec7b179 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap
@@ -32,8 +32,8 @@ exit_code: 0
----- stderr -----
🔄 Running user pre-merge check:
  echo 'USER_PRE_MERGE_RAN' > user_premerge.txt
-🔄 Merging 1 commit to main @ 90f2330 (no commit/squash/rebase needed)
-  * 90f2330 Add feature
+🔄 Merging 1 commit to main @ d233817 (no commit/squash/rebase needed)
+  * d233817 Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap
index 27bffe037..3182df837 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap
@@ -31,8 +31,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 90f2330 (no commit/squash/rebase needed)
-  * 90f2330 Add feature
+🔄 Merging 1 commit to main @ d233817 (no commit/squash/rebase needed)
+  * d233817 Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)