Skip to content

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

Add integration status symbols to removal messages

Maximilian Roos80d3be0a7092
diff --git a/.claude/rules/cli-output-formatting.md b/.claude/rules/cli-output-formatting.md
index f3ca14deb..96fdfee0a 100644
--- a/.claude/rules/cli-output-formatting.md
+++ b/.claude/rules/cli-output-formatting.md
@@ -89,13 +89,14 @@ behavior:
```rust
// GOOD - parallel structure with integration reason explaining branch deletion
// Both wt merge and wt remove show integration reason when branch is deleted
-"Removing feature worktree & branch in background (same commit as main)" // SameCommit
-"Removing feature worktree & branch in background (ancestor of main)" // Ancestor (main moved past)
-"Removing feature worktree & branch in background (no added changes)" // NoAddedChanges (empty 3-dot diff)
-"Removing feature worktree & branch in background (tree matches main)" // TreesMatch (squash/rebase)
-"Removing feature worktree & branch in background (all changes in main)" // MergeAddsNothing (squash + main advanced)
-"Removing feature worktree in background; retaining unmerged branch" // Unmerged (system keeps)
-"Removing feature worktree in background; retaining branch (--no-delete-branch)" // User flag (user keeps)
+// Target branch is bold; trailing dim symbol references wt list: _ (same commit), ⊂ (content integrated)
+"Removing feature worktree & branch in background (same commit as <bold>main</>, <dim>_</>)" // SameCommit
+"Removing feature worktree & branch in background (ancestor of <bold>main</>, <dim>⊂</>)" // Ancestor (main moved past)
+"Removing feature worktree & branch in background (no added changes on <bold>main</>, <dim>⊂</>)" // NoAddedChanges (empty 3-dot diff)
+"Removing feature worktree & branch in background (tree matches <bold>main</>, <dim>⊂</>)" // TreesMatch (squash/rebase)
+"Removing feature worktree & branch in background (all changes in <bold>main</>, <dim>⊂</>)" // MergeAddsNothing (squash + main advanced)
+"Removing feature worktree in background; retaining unmerged branch" // Unmerged (system keeps)
+"Removing feature worktree in background; retaining branch (--no-delete-branch)" // User flag (user keeps)
```
**Compute decisions once:** For background operations, check conditions upfront,
diff --git a/src/git/mod.rs b/src/git/mod.rs
index 3724d89a3..e917f3363 100644
--- a/src/git/mod.rs
+++ b/src/git/mod.rs
@@ -95,17 +95,28 @@ pub enum IntegrationReason {
impl IntegrationReason {
/// Human-readable description for use in messages (e.g., `wt remove` output).
///
- /// Returns the phrase to appear inside parentheses. Some include `{target}`
- /// placeholder for the target branch name.
+ /// Returns a phrase that expects the target branch name to follow
+ /// (e.g., "same commit as" + "main" → "same commit as main").
pub fn description(&self) -> &'static str {
match self {
Self::SameCommit => "same commit as",
Self::Ancestor => "ancestor of",
- Self::NoAddedChanges => "no added changes",
+ Self::NoAddedChanges => "no added changes on",
Self::TreesMatch => "tree matches",
Self::MergeAddsNothing => "all changes in",
}
}
+
+ /// Status symbol used in `wt list` for this integration reason.
+ ///
+ /// - `SameCommit` → `_` (matches `MainState::Empty`)
+ /// - Others → `⊂` (matches `MainState::Integrated`)
+ pub fn symbol(&self) -> &'static str {
+ match self {
+ Self::SameCommit => "_",
+ _ => "⊂",
+ }
+ }
}
/// Provider of integration signals for checking if a branch is integrated into target.
@@ -600,7 +611,7 @@ mod tests {
assert_eq!(IntegrationReason::Ancestor.description(), "ancestor of");
assert_eq!(
IntegrationReason::NoAddedChanges.description(),
- "no added changes"
+ "no added changes on"
);
assert_eq!(IntegrationReason::TreesMatch.description(), "tree matches");
assert_eq!(
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 03c189976..6e483cd37 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -207,11 +207,9 @@ fn get_flag_note(
let Some(target) = target_branch else {
return String::new();
};
+ let symbol = reason.symbol();
let desc = reason.description();
- match reason {
- IntegrationReason::NoAddedChanges => format!(" ({desc})"),
- _ => format!(" ({desc} {target})"),
- }
+ cformat!(" ({desc} <bold>{target}</>, <dim>{symbol}</>)")
}
}
}
@@ -975,35 +973,32 @@ mod tests {
" (--force-delete)"
);
- // Integration reasons
+ // Integration reasons - check description and target separately since target is styled
let cases = [
- (IntegrationReason::SameCommit, "same commit as main"),
- (IntegrationReason::Ancestor, "ancestor of main"),
- (IntegrationReason::TreesMatch, "tree matches main"),
- (IntegrationReason::MergeAddsNothing, "all changes in main"),
+ (IntegrationReason::SameCommit, "same commit as"),
+ (IntegrationReason::Ancestor, "ancestor of"),
+ (IntegrationReason::NoAddedChanges, "no added changes on"),
+ (IntegrationReason::TreesMatch, "tree matches"),
+ (IntegrationReason::MergeAddsNothing, "all changes in"),
];
- for (reason, expected_contains) in cases {
+ for (reason, expected_desc) in cases {
let note = get_flag_note(
BranchDeletionMode::SafeDelete,
&BranchDeletionOutcome::Integrated(reason),
Some("main"),
);
assert!(
- note.contains(expected_contains),
+ note.contains(expected_desc),
"reason {:?} should contain '{}'",
reason,
- expected_contains
+ expected_desc
+ );
+ assert!(
+ note.contains("main"),
+ "reason {:?} should contain target 'main'",
+ reason
);
}
-
- // NoAddedChanges is special - no target shown
- let note = get_flag_note(
- BranchDeletionMode::SafeDelete,
- &BranchDeletionOutcome::Integrated(IntegrationReason::NoAddedChanges),
- Some("main"),
- );
- assert!(note.contains("no added changes"));
- assert!(!note.contains("main"));
}
#[test]
@@ -1022,7 +1017,8 @@ mod tests {
);
assert!(msg.contains("feature"));
assert!(msg.contains("worktree & branch"));
- assert!(msg.contains("same commit as main"));
+ assert!(msg.contains("same commit as"));
+ assert!(msg.contains("main"));
// Removed worktree only (--no-delete-branch)
let msg = format_remove_worktree_message(
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index 48dec3458..c69247e99 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -27,4 +27,4 @@ expression: output.normalized()
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index 48dec3458..c69247e99 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -27,4 +27,4 @@ expression: output.normalized()
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index c12d32da6..c360bfb54 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -16,4 +16,4 @@ expression: output.normalized()
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index c12d32da6..c360bfb54 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -16,4 +16,4 @@ expression: output.normalized()
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
index 31a6e21e7..567b08191 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
@@ -32,4 +32,4 @@ All checks passed!
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
✅ Merged to main (1 commit, 2 files, +45)
-🔄 Removing feature-auth worktree & branch in background (same commit as main)
+🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
index 75f7ece37..db13bb2ff 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Removing feature-api worktree & branch in background (same commit as main)
+🔄 Removing feature-api worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
index a32c4560d..1c5f0b1d1 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Removing to-remove worktree & branch in background (same commit as main)
+🔄 Removing to-remove worktree & branch in background (same commit as main, _)
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 85c11fd4e..f1c3cfdde 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -35,4 +36,4 @@ Set-Location '[PATH]'
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 d6a2a4201..90bacf44a 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -35,4 +36,4 @@ cd '[PATH]'
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap
index 661de8ab0..b39434355 100644
--- a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap
+++ b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -29,4 +30,4 @@ exit_code: 0
Set-Location '[PATH]'
----- stderr -----
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 5edfe9ea5..5eb64381c 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -39,4 +40,4 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✅ Merged to main (1 commit, 2 files, +2)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 6050496c8..204ce012d 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -42,4 +43,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index be5ea308d..e33f08a78 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -38,4 +39,4 @@ exit_code: 0
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 fb003fee6..ded7ab5b4 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -39,4 +40,4 @@ exit_code: 0
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 a51e0878e..f5c695cbb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -33,4 +34,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
index 8be365ea6..b5ae54275 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -29,4 +30,4 @@ exit_code: 0
----- stderr -----
⚪ Already up to date with main (no new commits, no rebase needed)
-🔄 Removing no-commits worktree & branch in background (same commit as main)
+🔄 Removing no-commits worktree & branch in background (same commit as main, _)
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 cfdea5f1a..debbf0638 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -39,4 +40,4 @@ exit_code: 0
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing no-commits-dirty worktree & branch in background (same commit as main)
+🔄 Removing no-commits-dirty worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
index 813b7ef1a..f64e82192 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -34,4 +35,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 18d430310..8e44cd05f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -13,6 +13,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -32,4 +33,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 92f133818..4227127d5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -36,4 +37,4 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✅ Merged to main (2 commits, 2 files, +2)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 6140ddbb5..5ba451a59 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -33,4 +34,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 ea2cec12b..5508b35cb 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -34,7 +35,7 @@ exit_code: 1
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
🔄 Running project post-merge:
  exit 1
🟡 Command failed: exit status: 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 5528479fb..504e8669c 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -34,7 +35,7 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
🔄 Running project post-merge notify:
  echo 'Merge to main complete' > notify.txt
🔄 Running project post-merge deploy:
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 5ed762692..ab23e3703 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
@@ -16,6 +16,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -35,4 +36,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 253ce626a..4d0687887 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -34,6 +35,6 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
🔄 Running project post-merge:
  echo 'merged feature to main' > post-merge-ran.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
index e3a634467..2fa6c586a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -30,6 +31,6 @@ exit_code: 0
----- stderr -----
⚪ Already up to date with main (no new commits, no rebase needed)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
🔄 Running project post-merge:
  echo 'post-merge ran' > post-merge-ran.txt
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 814811e06..8e49fce0a 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -43,4 +44,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 785dfc232..ab2003414 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -40,4 +41,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 7e99e9505..4b55b55e4 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -34,4 +35,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 1897aa0f9..dc31da36b 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -36,4 +37,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 8ee02e67b..4b284fc08 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -37,4 +38,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 35adf27e1..d75674cfa 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -33,4 +34,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature-from-develop worktree & branch in background (same commit as main)
+🔄 Removing feature-from-develop worktree & branch in background (same commit as main, _)
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 31b07dc41..54f11627a 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -35,4 +36,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature-dirty-primary worktree & branch in background (same commit as main)
+🔄 Removing feature-dirty-primary worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
index 96b04c379..2aafdfeeb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -30,4 +31,4 @@ exit_code: 0
----- stderr -----
✅ Fast-forwarded to main
⚪ Already up to date with main (no new commits)
-🔄 Removing fast-forward-test worktree & branch in background (same commit as main)
+🔄 Removing fast-forward-test worktree & branch in background (same commit as main, _)
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 7d374d69a..23b20616c 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -35,4 +36,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing true-rebase-test worktree & branch in background (same commit as main)
+🔄 Removing true-rebase-test worktree & branch in background (same commit as main, _)
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 7fd028277..daf3f8188 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -45,4 +46,4 @@ exit_code: 0
  file3.txt | 1 +
  3 files changed, 3 insertions(+)
✅ Merged to main (1 commit, 3 files, +3)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 93643b9ac..70c39fbc3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -39,4 +40,4 @@ exit_code: 0
  - Revert to initial
⚪ No changes after squashing 3 commits
⚪ Already up to date with main (no new commits, no rebase needed)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 4487cdad0..fdb9a8a0a 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -33,4 +34,4 @@ exit_code: 0
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 ed1ca18a6..212ebd929 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -37,4 +38,4 @@ exit_code: 0
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 57221e7ca..5dd8b2721 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -41,4 +42,4 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✅ Merged to main (1 commit, 2 files, +2)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 18d430310..8e44cd05f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -13,6 +13,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -32,4 +33,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 fb6195357..68e857952 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -35,4 +36,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to staging (1 commit, 1 file, +1)
-🔄 Removing feature-for-staging worktree & branch in background (same commit as staging)
+🔄 Removing feature-for-staging worktree & branch in background (same commit as staging, _)
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 a51e0878e..f5c695cbb 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -33,4 +34,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 85f724217..7f7d1bc29 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -33,4 +34,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 21bad7003..fdee5739f 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
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -45,4 +46,4 @@ exit_code: 0
  untracked2.txt | 1 +
  3 files changed, 3 insertions(+)
✅ Merged to main (1 commit, 3 files, +3)
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 7a0a1377c..29cbfa214 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -64,7 +65,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin
  jwt.rs | 8 ++++++++
  3 files changed, 33 insertions(+)
✅ Merged to main (1 commit, 3 files, +33)
-🔄 Removing feature-auth worktree & branch in background (same commit as main)
+🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
🔄 Running project post-merge install:
  cargo install --path .
 Installing worktrunk v0.1.0
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 8f4f9df9d..58a587311 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
@@ -15,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -59,4 +60,4 @@ All checks passed!
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
✅ Merged to main (1 commit, 2 files, +45)
-🔄 Removing feature-auth worktree & branch in background (same commit as main)
+🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
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 383f30994..e2982dc87 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -33,4 +34,4 @@ exit_code: 0
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
✅ Merged to main (1 commit, 1 file, +13)
-🔄 Removing fix-auth worktree & branch in background (same commit as main)
+🔄 Removing fix-auth worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
index a54797eb8..17c4bc321 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/remove.rs
-assertion_line: 28
info:
program: wt
args:
@@ -16,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -34,4 +34,4 @@ exit_code: 0
🔄 Running project pre-remove:
  echo 'About to remove worktree'
About to remove worktree
-✅ Removed feature-hook worktree & branch (same commit as main)
+✅ Removed feature-hook worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap
index 6076566b8..9c2dfaf6f 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/remove.rs
-assertion_line: 28
info:
program: wt
args:
@@ -17,6 +16,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -32,4 +32,4 @@ exit_code: 0
----- stderr -----
🔄 Removing feature-skip worktree...
-✅ Removed feature-skip worktree & branch (same commit as main)
+✅ Removed feature-skip worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
index e596f1a3e..04cf3a593 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/remove.rs
-assertion_line: 28
info:
program: wt
args:
@@ -16,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -40,4 +40,4 @@ exit_code: 0
🔄 Running project pre-remove worktree_name:
  echo 'Name: repo.feature-templates'
Name: repo.feature-templates
-✅ Removed feature-templates worktree & branch (same commit as main)
+✅ Removed feature-templates worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
index 1905ce912..6bfbed242 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -29,4 +30,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch feature-squashed
-✅ Removed branch feature-squashed (tree matches main)
+✅ Removed branch feature-squashed (tree matches main, ⊂)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap
index dad25383b..c2fefcd1d 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap
@@ -30,4 +30,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch npm
-✅ Removed branch npm (same commit as main)
+✅ Removed branch npm (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
index 1f0561a27..f25194fe8 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -29,4 +30,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch feature-merged
-✅ Removed branch feature-merged (same commit as main)
+✅ Removed branch feature-merged (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
index ec4ca37d9..a9ede04cf 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -28,4 +29,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-a worktree & branch in background (same commit as main)
+🔄 Removing feature-a worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
index ed1930955..f8ce4c4e7 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -28,4 +29,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-b worktree & branch in background (same commit as main)
+🔄 Removing feature-b worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
index 0ecef2cde..74c2dc93e 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -28,4 +29,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-current worktree & branch in background (same commit as main)
+🔄 Removing feature-current worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
index 9f719d178..4b4f77d46 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/remove.rs
-assertion_line: 28
info:
program: wt
args:
@@ -16,6 +15,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -31,4 +31,4 @@ exit_code: 0
----- stderr -----
🔄 Removing feature-fg worktree...
-✅ Removed feature-fg worktree & branch (same commit as main)
+✅ Removed feature-fg worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
index dc6faed85..e44be688c 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -13,6 +13,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -27,4 +28,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-wt worktree & branch in background (same commit as main)
+🔄 Removing feature-wt worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
index 442fce4db..f1e9b5bc5 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -29,4 +30,4 @@ exit_code: 0
cd '[REPO]'
----- stderr -----
-🔄 Removing feature-internal worktree & branch in background (same commit as main)
+🔄 Removing feature-internal worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap
index ae5f35038..523790774 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -29,4 +30,4 @@ exit_code: 0
----- stderr -----
🔄 Removing current worktree...
-✅ Removed feature worktree & branch; changed directory to [REPO] (same commit as main)
+✅ Removed feature worktree & branch; changed directory to [REPO] (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap
index 49cbc0345..56b2efb29 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap
@@ -14,6 +14,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -28,4 +29,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature2 worktree & branch in background (same commit as main)
+🔄 Removing feature2 worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index 9de21e00d..41270add3 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
@@ -16,6 +16,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -30,6 +31,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-b worktree & branch in background (same commit as main)
-🔄 Removing feature-c worktree & branch in background (same commit as main)
-🔄 Removing feature-a worktree & branch in background (same commit as main)
+🔄 Removing feature-b worktree & branch in background (same commit as main, _)
+🔄 Removing feature-c worktree & branch in background (same commit as main, _)
+🔄 Removing feature-a worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
index 8aa89aa3e..0be6354b6 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
@@ -16,6 +16,7 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
@@ -30,6 +31,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-a worktree & branch in background (same commit as main)
-🔄 Removing feature-b worktree & branch in background (same commit as main)
-🔄 Removing feature-c worktree & branch in background (same commit as main)
+🔄 Removing feature-a worktree & branch in background (same commit as main, _)
+🔄 Removing feature-b worktree & branch in background (same commit as main, _)
+🔄 Removing feature-c worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap
index 3bf939d12..eafd16252 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap
@@ -30,5 +30,5 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Removing feature worktree & branch in background (same commit as main)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
❌ No worktree found for branch nonexistent
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap b/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap
index 84652c4ff..5cc42800a 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap
@@ -6,6 +6,7 @@ info:
- remove
- feature-squash
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -13,10 +14,15 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ 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,4 +30,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch feature-squash
-✅ Removed branch feature-squash (all changes in main)
+✅ Removed branch feature-squash (all changes in main, ⊂)