Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Remove `--decorate` flag from git log output for merge and push
Maximilian Rooscf8fb79496af
diff --git a/README.md b/README.mdindex af4fdf0ba..677afd815 100644--- a/README.md+++ b/README.md@@ -44,7 +44,7 @@ $ wt switch --create fix-auth```bash$ wt mergeπ Merging 1 commit to main @ a1b2c3d (no commit/squash/rebase needed)- * a1b2c3d (HEAD -> fix-auth) Implement JWT validation+ * a1b2c3d Implement JWT validationauth.rs | 13 +++++++++++++1 file changed, 13 insertions(+)β Merged to main (1 commit, 1 file, +13)@@ -137,7 +137,7 @@ $ wt mergeπ Running pre-merge lint:cargo clippyπ Merging 1 commit to main @ a1b2c3d (no rebase needed)- * a1b2c3d (HEAD -> feature-auth) feat(auth): Implement JWT authentication system+ * a1b2c3d feat(auth): Implement JWT authentication systemauth.rs | 8 ++++++++auth_test.rs | 17 +++++++++++++++++jwt.rs | 8 ++++++++@@ -223,7 +223,7 @@ tests/test_auth.py::test_token_validation PASSED [100%]All checks passed!π Merging 1 commit to main @ a1b2c3d (no rebase needed)- * a1b2c3d (HEAD -> feature-auth) feat(api): Add user authentication endpoints+ * a1b2c3d feat(api): Add user authentication endpointsapi/auth.py | 31 +++++++++++++++++++++++++++++++tests/test_auth.py | 14 ++++++++++++++2 files changed, 45 insertions(+)diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex fb98d43aa..3c59cd269 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -495,7 +495,6 @@ pub fn handle_push("--color=always","--graph","--oneline",- "--decorate",&format!("HEAD..{}", target_branch),])?.trim()@@ -581,7 +580,6 @@ pub fn handle_push("--color=always","--graph","--oneline",- "--decorate",&format!("{}..HEAD", target_branch),])?;crate::output::gutter(format_with_gutter(&log_output, "", None))?;diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex d8331d373..720ec0d00 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -2262,7 +2262,7 @@ fn test_merge_no_commit_with_clean_tree() {exit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)- [107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+ [107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)@@ -2366,7 +2366,7 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {exit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)- [107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+ [107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex fbe6173ea..2f8b1f00a 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@@ -23,7 +23,7 @@ expression: output.normalized()[check2] stdout complete[check2] stderr completeπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)-[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex fbe6173ea..2f8b1f00a 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@@ -23,7 +23,7 @@ expression: output.normalized()[check2] stdout complete[check2] stderr completeπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)-[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 323f81f39..931a20927 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@@ -12,7 +12,7 @@ expression: output.normalized()[107m [0m [1m[2m[34mecho[0m [2m[32m'β All 47 tests passed in 2.3s'[0m[0mβ All 47 tests passed in 2.3sπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)-[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 323f81f39..931a20927 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@@ -12,7 +12,7 @@ expression: output.normalized()[107m [0m [1m[2m[34mecho[0m [2m[32m'β All 47 tests passed in 2.3s'[0m[0mβ All 47 tests passed in 2.3sπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)-[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature+[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 05ec516f8..97512f133 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@@ -27,7 +27,7 @@ tests/test_auth.py::test_token_validation PASSED [100%]All checks passed!π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no rebase needed)-[107m [0m * [33m[HASH][m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(api): Add user authentication endpoints+[107m [0m * [33m[HASH][m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)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.snapindex 7819b703e..dbd21de2a 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@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex a5ba6a96c..bf3223760 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differdiff --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.snapindex 44897e2ce..bbf1d0391 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@@ -27,7 +27,7 @@ exit_code: 0[107m [0m [1mfix: update file 1 content[0mβ [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m fix: update file 1 content+[107m [0m * [SHA] fix: update file 1 content[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 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.snapindex 06cc88111..306bbba4e 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@@ -31,7 +31,7 @@ exit_code: 0[107m [0m - feat: initial featureβ [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m * [SHA] Squash commits from main[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex f4891b4ae..1ee9ac5ed 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@@ -27,7 +27,7 @@ exit_code: 0[107m [0m [1mfix: improve auth validation logic[0mβ [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m fix: improve auth validation logic+[107m [0m * [SHA] fix: improve auth validation logic[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 3b4ffc5ed..cfb6d1287 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap@@ -28,7 +28,7 @@ exit_code: 0[107m [0m [1mChanges to dirty.txt[0mβ [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to dirty.txt+[107m [0m * [SHA] Changes to dirty.txt[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 09d3c0efb..c7dd46d73 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -22,7 +22,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 53589ffab..b4dd66a95 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap@@ -28,7 +28,7 @@ exit_code: 0[107m [0m [1mChanges to newfile.txt[0mβ [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mno-commits-dirty[m[33m)[m Changes to newfile.txt+[107m [0m * [SHA] Changes to newfile.txt[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 611b68a19..fe4f33011 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -21,7 +21,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 4c8b35467..4905893a8 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -23,7 +23,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 2 commits to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: add file 2+[107m [0m * [SHA] feat: add file 2[107m [0m * [SHA] feat: add file 1[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 09d3c0efb..c7dd46d73 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@@ -22,7 +22,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 5439a9071..7c1af5abc 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@@ -23,7 +23,7 @@ success: falseexit_code: 1----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 3e63466a2..2feb754bd 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@@ -23,7 +23,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 5cea7c09d..a0af1cefd 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@@ -24,7 +24,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 349b125a4..ccae0c0c4 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@@ -23,7 +23,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 3278ccfe7..4202b5345 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@@ -31,7 +31,7 @@ exit_code: 0[107m [0m [1mChanges to feature.txt[0mβ [32mCommitted changes @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to feature.txt+[107m [0m * [SHA] Changes to feature.txt[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 4ad58809e..c6c658e7f 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@@ -29,7 +29,7 @@ exit_code: 0π [36mRunning pre-merge [1mtest[0m:[0m[107m [0m [1m[2m[34mexit[0m 0[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 2894208af..a04d5bf88 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@@ -25,7 +25,7 @@ exit_code: 0π [36mRunning pre-merge:[0m[107m [0m [1m[2m[34mexit[0m 0[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 6ab81949b..796daa7c0 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@@ -25,7 +25,7 @@ exit_code: 0π [36mRunning pre-commit:[0m[107m [0m [1m[2m[34mecho[0m [2m[32m'Pre-commit check passed'[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex c10d54bdd..50d8896d6 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@@ -22,7 +22,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-from-develop[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex de538fa9c..b4d049df8 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@@ -24,7 +24,7 @@ exit_code: 0π [36mRebasing onto [1m[36mmain[0m[36m...[0mβ [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-dirty-primary[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex dce44c8fb..9bfee154c 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@@ -23,7 +23,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex fe278aa4a..829ce71c5 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@@ -24,7 +24,7 @@ exit_code: 0π [36mRebasing onto [1m[36mmain[0m[36m...[0mβ [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mtrue-rebase-test[m[33m)[m Add feature+[107m [0m * [SHA] Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 5349c73b7..0f12f382b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -32,7 +32,7 @@ exit_code: 0[107m [0m - docs: update readmeβ [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m * [SHA] Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m file3.txt | 1 [32m+[mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex 1014015e3..8988c6311 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -32,7 +32,7 @@ exit_code: 0[107m [0m - fix: bug fixβ [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m * [SHA] Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)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.snapindex d951f9e0a..187df6883 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@@ -22,7 +22,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commit+[107m [0m * [SHA] feat: single commit[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex cbeba5529..8a2c7cb61 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap@@ -26,7 +26,7 @@ exit_code: 0[107m [0m [1mfeat: implement user authentication system[0mβ [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: implement user authentication system+[107m [0m * [SHA] feat: implement user authentication system[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex f87501771..9959f842a 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@@ -34,7 +34,7 @@ exit_code: 0[107m [0m - feat: add file 2β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m * [SHA] Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 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.snapindex 611b68a19..fe4f33011 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -21,7 +21,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 4c9e8e49f..137a7e7d2 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@@ -24,7 +24,7 @@ exit_code: 0π [36mRebasing onto [1m[36mstaging[0m[36m...[0mβ [32mRebased onto [1m[32mstaging[0m[0mπ [36mMerging 1 commit to [1m[36mstaging[0m[36m @ [2m[SHA][0m (no commit/squash needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-for-staging[m[33m)[m Add feature for staging+[107m [0m * [SHA] Add feature for staging[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mstaging[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex 09d3c0efb..c7dd46d73 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@@ -22,7 +22,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex dce44c8fb..9bfee154c 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@@ -23,7 +23,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)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.snapindex fc4dae7e7..957afbcef 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@@ -36,7 +36,7 @@ exit_code: 0[107m [0m - feat: add file 1β [32mSquashed @ [2m[SHA][0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main+[107m [0m * [SHA] Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m untracked1.txt | 1 [32m+[m[107m [0m untracked2.txt | 1 [32m+[mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 4ae363b1e..bf1fefc7c 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -40,7 +40,7 @@ exit_code: 0π [36mRunning pre-merge [1mlint[0m:[0m[107m [0m [1m[2m[34mcargo[0m clippy[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(auth): Implement JWT authentication system+[107m [0m * [SHA] feat(auth): Implement JWT authentication system[107m [0m auth.rs | 8 [32m++++++++[m[107m [0m auth_test.rs | 17 [32m+++++++++++++++++[m[107m [0m jwt.rs | 8 [32m++++++++[mdiff --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.snapindex d564b5d0e..3ca5dbced 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@@ -35,7 +35,7 @@ exit_code: 0π [36mRunning pre-merge [1mlint[0m:[0m[107m [0m [1m[2m[34muv[0m run ruff check[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(api): Add user authentication endpoints+[107m [0m * [SHA] feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 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.snapindex 6ca4d5bd3..a2127afd0 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -22,7 +22,7 @@ success: trueexit_code: 0----- stdout -----π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)-[107m [0m * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfix-auth[m[33m)[m Implement JWT validation+[107m [0m * [SHA] Implement JWT validation[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+13[0m)