Skip to content

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

feat(list): name a detached row by its short hash, not `-` (#3675)

Maximilian Roos9eb473e05687
diff --git a/docs/content/list.md b/docs/content/list.md
index a078657f6..221fa87e5 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -74,7 +74,7 @@ Output as JSON for scripting:
| Column | Shows |
|--------|-------|
-| Branch | Branch name |
+| Branch | Branch name; a detached worktree has none, so it shows its short hash in dim yellow |
| Status | Compact symbols (see below) |
| HEAD± | Uncommitted changes: +added -deleted lines |
| main↕ | Commits ahead/behind default branch |
@@ -173,7 +173,7 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
| `⊟` | `worktree.state` `"prunable"` | Prunable (worktree directory missing) |
| `⊞` | `worktree.state` `"locked"` | Locked worktree |
| `⚑` | `worktree.state` `"duplicate_branch"` | Branch checked out in more than one worktree, so `wt` resolves it to whichever git lists first; every worktree on the branch is flagged |
-| `⚑` | `worktree.state` `"branch_worktree_mismatch"` | Branch name doesn't match the worktree path |
+| `⚑` | `worktree.state` `"branch_worktree_mismatch"` | Worktree isn't at the path its branch implies — including a detached one, which has no branch to imply a path and so is never at home |
| `/` | `kind` `"branch"` | Branch without a worktree (no `worktree` object) |
### Default branch
diff --git a/plugins/worktrunk/skills/worktrunk/reference/list.md b/plugins/worktrunk/skills/worktrunk/reference/list.md
index 807765bf5..4eb082e5f 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/list.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/list.md
@@ -63,7 +63,7 @@ $ wt list --format=json
| Column | Shows |
|--------|-------|
-| Branch | Branch name |
+| Branch | Branch name; a detached worktree has none, so it shows its short hash in dim yellow |
| Status | Compact symbols (see below) |
| HEAD± | Uncommitted changes: +added -deleted lines |
| main↕ | Commits ahead/behind default branch |
@@ -158,7 +158,7 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
| `⊟` | `worktree.state` `"prunable"` | Prunable (worktree directory missing) |
| `⊞` | `worktree.state` `"locked"` | Locked worktree |
| `⚑` | `worktree.state` `"duplicate_branch"` | Branch checked out in more than one worktree, so `wt` resolves it to whichever git lists first; every worktree on the branch is flagged |
-| `⚑` | `worktree.state` `"branch_worktree_mismatch"` | Branch name doesn't match the worktree path |
+| `⚑` | `worktree.state` `"branch_worktree_mismatch"` | Worktree isn't at the path its branch implies — including a detached one, which has no branch to imply a path and so is never at home |
| `/` | `kind` `"branch"` | Branch without a worktree (no `worktree` object) |
### Default branch
diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.md
index 807765bf5..4eb082e5f 100644
--- a/skills/worktrunk/reference/list.md
+++ b/skills/worktrunk/reference/list.md
@@ -63,7 +63,7 @@ $ wt list --format=json
| Column | Shows |
|--------|-------|
-| Branch | Branch name |
+| Branch | Branch name; a detached worktree has none, so it shows its short hash in dim yellow |
| Status | Compact symbols (see below) |
| HEAD± | Uncommitted changes: +added -deleted lines |
| main↕ | Commits ahead/behind default branch |
@@ -158,7 +158,7 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
| `⊟` | `worktree.state` `"prunable"` | Prunable (worktree directory missing) |
| `⊞` | `worktree.state` `"locked"` | Locked worktree |
| `⚑` | `worktree.state` `"duplicate_branch"` | Branch checked out in more than one worktree, so `wt` resolves it to whichever git lists first; every worktree on the branch is flagged |
-| `⚑` | `worktree.state` `"branch_worktree_mismatch"` | Branch name doesn't match the worktree path |
+| `⚑` | `worktree.state` `"branch_worktree_mismatch"` | Worktree isn't at the path its branch implies — including a detached one, which has no branch to imply a path and so is never at home |
| `/` | `kind` `"branch"` | Branch without a worktree (no `worktree` object) |
### Default branch
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 4ec1c6e31..4721d6f0f 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -825,7 +825,7 @@ $ wt list --format=json
| Column | Shows |
|--------|-------|
-| Branch | Branch name |
+| Branch | Branch name; a detached worktree has none, so it shows its short hash in dim yellow |
| Status | Compact symbols (see below) |
| HEAD± | Uncommitted changes: +added -deleted lines |
| main↕ | Commits ahead/behind default branch |
@@ -920,7 +920,7 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
| `⊟` | `worktree.state` `"prunable"` | Prunable (worktree directory missing) |
| `⊞` | `worktree.state` `"locked"` | Locked worktree |
| `⚑` | `worktree.state` `"duplicate_branch"` | Branch checked out in more than one worktree, so `wt` resolves it to whichever git lists first; every worktree on the branch is flagged |
-| `⚑` | `worktree.state` `"branch_worktree_mismatch"` | Branch name doesn't match the worktree path |
+| `⚑` | `worktree.state` `"branch_worktree_mismatch"` | Worktree isn't at the path its branch implies — including a detached one, which has no branch to imply a path and so is never at home |
| `/` | `kind` `"branch"` | Branch without a worktree (no `worktree` object) |
### Default branch
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index b5d7fb7bc..52e320f59 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -1186,7 +1186,21 @@ pub fn calculate_layout_with_width(
.filter_map(|item| item.branch.as_deref())
.max_by_key(|b| b.width());
- let max_branch = longest_branch.map(|b| b.width()).unwrap_or(0);
+ // A detached row shows its abbreviated HEAD in this column
+ // (`ListItem::display_name`), so the column has to fit a SHA as well as the
+ // branch names — the same `COMMIT_HASH_WIDTH` the Commit column budgets for
+ // the identical string.
+ let detached_width = items
+ .iter()
+ .any(|item| item.branch.is_none())
+ .then_some(COMMIT_HASH_WIDTH);
+
+ let max_branch = longest_branch
+ .map(|b| b.width())
+ .into_iter()
+ .chain(detached_width)
+ .max()
+ .unwrap_or(0);
let max_branch = fit_header(ColumnKind::Branch.header(), max_branch);
let path_data_width = items
@@ -2084,6 +2098,40 @@ mod tests {
);
}
+ /// A detached row shows its abbreviated HEAD in the Branch column, so the
+ /// column has to fit a SHA even when every branch name is shorter than one.
+ /// Sized off the names alone it would truncate the hash mid-way.
+ #[test]
+ fn test_branch_column_fits_a_detached_rows_sha() {
+ let mut detached = make_test_item("main");
+ detached.branch = None;
+ let items = vec![make_test_item("main"), detached];
+
+ let layout = calculate_layout_with_width(
+ &items,
+ &non_full_run_tasks(),
+ Destination {
+ width: 200,
+ link_style: LinkStyle::Expanded,
+ },
+ Path::new("/test"),
+ None,
+ None,
+ ColumnSelection {
+ custom: &[],
+ selected: None,
+ },
+ );
+
+ let branch = find_column(&layout, ColumnKind::Branch).expect("Branch allocated");
+ assert_eq!(
+ branch.width, COMMIT_HASH_WIDTH,
+ "the Branch column fits the abbreviated HEAD a detached row renders, \
+ not just the branch names ({:?} wide)",
+ branch.width
+ );
+ }
+
#[test]
fn test_layout_renders_column_iff_task_planned() {
// The layout stage honors the run plan literally: a column renders iff one
diff --git a/src/commands/list/model/item.rs b/src/commands/list/model/item.rs
index 6d7e61f39..b44b1872a 100644
--- a/src/commands/list/model/item.rs
+++ b/src/commands/list/model/item.rs
@@ -409,11 +409,34 @@ impl ListItem {
}
/// Short display name for this item — the branch if present, otherwise
- /// the short SHA. Use when reporting which item is pending, stuck, or
+ /// the abbreviated HEAD. Use when reporting which item is pending, stuck, or
/// missing: `branch_name()`'s `"(detached)"` fallback collapses distinct
/// detached items into one label.
+ ///
+ /// Also the Branch cell's text: a detached worktree has no name to put
+ /// there, so the column shows this instead (styled `DETACHED`, since a SHA
+ /// is a legal branch name too).
pub fn display_name(&self) -> &str {
- self.branch.as_deref().unwrap_or(&self.short_sha)
+ self.branch
+ .as_deref()
+ .unwrap_or_else(|| self.abbreviated_head())
+ }
+
+ /// HEAD abbreviated for the table: a fixed 8-character prefix, empty for a
+ /// null OID (an unborn branch). The Commit cell of every row and the Branch
+ /// cell of a detached one both render this, so the row that shows both
+ /// prints the same commit the same way twice.
+ ///
+ /// Not [`Self::short_sha`] (`%h`, `core.abbrev`-aware, and what the JSON
+ /// output carries): it lands post-skeleton, so sourcing one of those cells
+ /// from each would give a row two lengths of the same SHA, and a detached
+ /// row a Branch cell that fills in late.
+ pub fn abbreviated_head(&self) -> &str {
+ if self.head == worktrunk::git::NULL_OID {
+ ""
+ } else {
+ &self.head[..8.min(self.head.len())]
+ }
}
pub fn is_main(&self) -> bool {
@@ -504,9 +527,12 @@ impl ListItem {
let mut segments = Vec::new();
- // 1. Branch name (priority 1)
+ // 1. Branch name (priority 1) — `display_name`, so the prompt names a
+ // detached worktree the way its `wt list` row does: the abbreviated
+ // HEAD, which also tells two detached worktrees apart where the
+ // `"(detached)"` label collapses them.
segments.push(StatuslineSegment::from_column(
- self.branch_name().to_string(),
+ self.display_name().to_string(),
ColumnKind::Branch,
));
@@ -912,6 +938,32 @@ mod tests {
assert_eq!(item.branch_name(), "(detached)");
}
+ /// The Branch cell of a detached row renders `display_name`, and the Commit
+ /// cell of every row renders `abbreviated_head` — the same string, so the
+ /// row that shows both agrees with itself. Neither waits on the `%h` batch
+ /// that populates `short_sha` post-skeleton.
+ #[test]
+ fn test_list_item_display_name_falls_back_to_abbreviated_head() {
+ let head = "abc123def456abc123def456abc123def456abcd";
+ let mut item = ListItem::new_branch(head.to_string(), "feature".to_string());
+ assert_eq!(item.display_name(), "feature");
+
+ item.branch = None; // Simulate detached
+ assert_eq!(item.display_name(), "abc123de");
+ assert_eq!(item.abbreviated_head(), "abc123de");
+
+ // `short_sha` lands later and is `core.abbrev`-aware; the cells keep
+ // the fixed prefix so the two never print at different lengths.
+ item.short_sha = "abc123d".to_string();
+ assert_eq!(item.display_name(), "abc123de");
+
+ // An unborn branch has no commit to abbreviate — the cell stays empty
+ // rather than rendering a row of zeros.
+ let unborn =
+ ListItem::new_branch(worktrunk::git::NULL_OID.to_string(), "unborn".to_string());
+ assert_eq!(unborn.abbreviated_head(), "");
+ }
+
#[test]
fn test_list_item_head() {
let item = ListItem::new_branch("abc123def".to_string(), "feature".to_string());
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 5dbe3122c..aef80b933 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -1,7 +1,7 @@
use crate::display::{format_relative_time_short, shorten_path, truncate_to_width};
use anstyle::{Effects, Style};
use unicode_width::UnicodeWidthStr;
-use worktrunk::styling::StyledLine;
+use worktrunk::styling::{DETACHED, StyledLine};
use super::columns::{ColumnKind, DiffVariant};
use super::layout::{
@@ -286,7 +286,7 @@ impl LayoutConfig {
/// Used for both worktrees and branch-only items; branch-only rows render an empty path
/// and a blank gutter placeholder. See [`Self::render_list_item_line`] for `placeholder` semantics.
pub fn render_skeleton_row(&self, item: &ListItem, placeholder: &str) -> StyledLine {
- let branch = item.branch_name();
+ let branch = item.display_name();
let shortened_path = item
.worktree_path()
.map(|p| shorten_path(p, &self.main_worktree_path))
@@ -315,8 +315,15 @@ impl LayoutConfig {
}
}
ColumnKind::Branch => {
- // Show actual branch name (no dim - start normal, gray out later if removable)
- cell.push_raw(branch.to_string());
+ // Show actual branch name (no dim - start normal, gray out later if removable).
+ // A detached row shows its abbreviated HEAD in the settled
+ // row's `DETACHED` style, so the cell doesn't restyle as
+ // the row fills in.
+ if item.branch.is_none() {
+ cell.push_styled(branch.to_string(), DETACHED);
+ } else {
+ cell.push_raw(branch.to_string());
+ }
cell.pad_to(col.width);
}
ColumnKind::Path => {
@@ -326,9 +333,8 @@ impl LayoutConfig {
}
ColumnKind::Commit => {
// Show actual commit hash (empty for unborn branches with null OID)
- let head = item.head();
- if head != worktrunk::git::NULL_OID {
- let short_head = &head[..8.min(head.len())];
+ let short_head = item.abbreviated_head();
+ if !short_head.is_empty() {
cell.push_styled(short_head, dim);
}
}
@@ -458,8 +464,19 @@ impl ColumnLayout {
cell
}
ColumnKind::Branch => {
- let text = item.branch.as_deref().unwrap_or("-");
- self.render_text_cell(text, text_style)
+ // A detached worktree has no name for this cell, so it carries
+ // the abbreviated HEAD — the Commit column's value, repeated
+ // here because the column's question is "which ref is this?"
+ // and a SHA is the answer. `DETACHED` outranks `text_style`:
+ // the removable dim still reaches this row's Path and Message
+ // cells, while yellow keeps the SHA from reading as a branch
+ // that happens to be named like one.
+ let style = if item.branch.is_none() {
+ Some(DETACHED)
+ } else {
+ text_style
+ };
+ self.render_text_cell(item.display_name(), style)
}
ColumnKind::Status => {
// `render_with_mask` emits the placeholder glyph per
@@ -572,13 +589,11 @@ impl ColumnLayout {
}
}
ColumnKind::Commit => {
- let head = item.head();
- if head == worktrunk::git::NULL_OID {
- self.render_text_cell("", None)
- } else {
- let short_head = &head[..8.min(head.len())];
- self.render_text_cell(short_head, Some(Style::new().dimmed()))
- }
+ // Style only a real SHA: an empty cell (null OID) styled would
+ // render as bare escape codes around nothing.
+ let short_head = item.abbreviated_head();
+ let style = (!short_head.is_empty()).then(|| Style::new().dimmed());
+ self.render_text_cell(short_head, style)
}
ColumnKind::Summary => match &item.summary {
None => self.placeholder_cell(placeholder),
diff --git a/src/commands/picker/items.rs b/src/commands/picker/items.rs
index eb33fe9e5..055ed8cdf 100644
--- a/src/commands/picker/items.rs
+++ b/src/commands/picker/items.rs
@@ -445,8 +445,9 @@ pub(super) fn push_pr_search_tokens(
/// without a re-send; the row may re-rank as that data streams in during the
/// first frame.
pub(super) struct PickerRow {
- /// The stable, skeleton-time head of the matcher text: branch name plus —
- /// for a worktree row — the distinct worktree path. The PR tokens and
+ /// The stable, skeleton-time head of the matcher text: the Branch column's
+ /// text — branch name, or the abbreviated HEAD for a detached worktree —
+ /// plus, for a worktree row, the distinct worktree path. The PR tokens and
/// trailing gutter glyph are appended live in `text()`.
pub search_base: String,
/// Trailing gutter glyph (`@`/`^`/`+`/`/`/`|`, or `#` for a listed `--prs`
diff --git a/src/commands/picker/progressive_handler.rs b/src/commands/picker/progressive_handler.rs
index 69724ee9a..f09bf8f17 100644
--- a/src/commands/picker/progressive_handler.rs
+++ b/src/commands/picker/progressive_handler.rs
@@ -398,7 +398,11 @@ impl PickerProgressHandler for PickerHandler {
// filters those (see
// `folded_pr_reference_filters_under_skims_default_engine`).
let gutter = item.kind.gutter_glyph();
- let mut search_base = branch_name.clone();
+ // `display_name`, not `branch_name`: a detached row shows its
+ // abbreviated HEAD in the Branch column, so that's what the user
+ // reads and types. `branch_name`'s `"(detached)"` matches nothing
+ // on screen, and collapses every detached row onto one token.
+ let mut search_base = item.display_name().to_string();
if !path_str.is_empty() {
search_base.push(' ');
search_base.push_str(&path_str);
diff --git a/src/styling/constants.rs b/src/styling/constants.rs
index 4cfaaca31..6f60f4cdb 100644
--- a/src/styling/constants.rs
+++ b/src/styling/constants.rs
@@ -41,6 +41,15 @@ pub const ADDITION: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Gr
/// Deletion style for diffs (red) - used in table rendering
pub const DELETION: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Red)));
+/// Detached-HEAD style (dim yellow) - used in table rendering
+///
+/// Marks the abbreviated HEAD a `wt list` Branch cell shows when the worktree
+/// has no branch. Yellow separates it from a branch literally named like a SHA;
+/// dim keeps a row that isn't on a branch from reading as loudly as one that is.
+pub const DETACHED: Style = Style::new()
+ .fg_color(Some(Color::Ansi(AnsiColor::Yellow)))
+ .dimmed();
+
/// Gutter style for quoted content (commands, config, error details)
///
/// We wanted the dimmest/most subtle background that works on both dark and light
diff --git a/tests/integration_tests/statusline.rs b/tests/integration_tests/statusline.rs
index 64d3af8d5..0b459580f 100644
--- a/tests/integration_tests/statusline.rs
+++ b/tests/integration_tests/statusline.rs
@@ -480,12 +480,16 @@ fn test_statusline_detached_head(mut repo: TestRepo) {
.run()
.unwrap();
- // Verify statusline shows the detached marker, not the prior branch name.
+ // Verify the statusline names a detached worktree the way its `wt list`
+ // row does — by the abbreviated HEAD — and not by the prior branch name.
+ // The SHA also tells two detached worktrees apart, which one shared
+ // "(detached)" label cannot.
let output = run_statusline_from_dir(&repo, &[], None, &feature_path);
- // In detached state we render "(detached)" in place of a branch name.
+ let head = repo.git_output(&["rev-parse", "HEAD"]);
+ let short_head = &head.trim()[..8];
assert!(
- output.contains("(detached)"),
- "statusline should show '(detached)' for detached HEAD, got: {output}"
+ output.contains(short_head),
+ "statusline should show the abbreviated HEAD ({short_head}) for detached HEAD, got: {output}"
);
assert!(
!output.contains("feature"),
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index bf8eeaaa3..0a81bb3a0 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -9,6 +9,13 @@ info:
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_ALLOW_PROTOCOL: file
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
LANG: C
LC_ALL: C
LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
@@ -135,7 +142,7 @@ Output as JSON for scripting:
Column Shows
──────── ───────────────────────────────────────────────────────────────────────────────────────────────────
- Branch Branch name
+ Branch Branch name; a detached worktree has none, so it shows its short hash in dim yellow
Status Compact symbols (see below)
HEAD± Uncommitted changes: +added -deleted lines
main↕ Commits ahead/behind default branch
@@ -229,7 +236,7 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
⊟ worktree.state "prunable" Prunable (worktree directory missing)
⊞ worktree.state "locked" Locked worktree
⚑ worktree.state "duplicate_branch" Branch checked out in more than one worktree, so wt resolves it to whichever git lists first; every worktree on the branch is flagged
- ⚑ worktree.state "branch_worktree_mismatch" Branch name doesn't match the worktree path
+ ⚑ worktree.state "branch_worktree_mismatch" Worktree isn't at the path its branch implies — including a detached one, which has no branch to imply a path and so is never at home
/ kind "branch" Branch without a worktree (no worktree object)
Default branch
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
index ef23f2312..70ca7f461 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
@@ -9,6 +9,13 @@ info:
CLICOLOR_FORCE: "1"
COLUMNS: "80"
GIT_ALLOW_PROTOCOL: file
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
LANG: C
LC_ALL: C
LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
@@ -146,7 +153,8 @@ Output as JSON for scripting:
Column Shows
──────── ─────────────────────────────────────────────────────────────────────
- Branch Branch name
+ Branch Branch name; a detached worktree has none, so it shows its short hash
+ in dim yellow
Status Compact symbols (see below)
HEAD± Uncommitted changes: +added -deleted lines
main↕ Commits ahead/behind default branch
@@ -285,8 +293,10 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
"duplicate_branch" worktree, so wt resolves it to whichever
git lists first; every worktree on the
branch is flagged
- ⚑ worktree.state Branch name doesn't match the worktree
- "branch_worktree_mismatch" path
+ ⚑ worktree.state Worktree isn't at the path its branch
+ "branch_worktree_mismatch" implies — including a detached one, which
+ has no branch to imply a path and so is
+ never at home
/ kind "branch" Branch without a worktree (no worktree
object)
diff --git a/tests/snapshots/integration__integration_tests__list__list_detached_head.snap b/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
index 8348e209a..b9550f42f 100644
--- a/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
@@ -9,10 +9,20 @@ info:
CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
+ GIT_ALLOW_PROTOCOL: file
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_AUTHOR_EMAIL: [email protected]
+ GIT_AUTHOR_NAME: Test User
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
- GIT_CONFIG_SYSTEM: /dev/null
+ GIT_COMMITTER_EMAIL: [email protected]
+ GIT_COMMITTER_NAME: Test User
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
@@ -35,6 +45,7 @@ info:
WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
+ WORKTRUNK_TEST_PARENT_SHELL: ""
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -45,7 +56,7 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
-@ - ⚑^ . 05a4a45d 16h Initial commit
+@ 05a4a45d ⚑^ . 05a4a45d 16h Initial commit
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
index a4ecf52fc..47945761b 100644
--- a/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
@@ -9,10 +9,20 @@ info:
CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
+ GIT_ALLOW_PROTOCOL: file
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_AUTHOR_EMAIL: [email protected]
+ GIT_AUTHOR_NAME: Test User
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
- GIT_CONFIG_SYSTEM: /dev/null
+ GIT_COMMITTER_EMAIL: [email protected]
+ GIT_COMMITTER_NAME: Test User
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
@@ -35,6 +45,7 @@ info:
WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
+ WORKTRUNK_TEST_PARENT_SHELL: ""
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -46,7 +57,7 @@ exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
@ main ^| | . 05a4a45d 16h Initial commit
-+ - ⚑_ ../repo.feature 05a4a45d 16h Initial commit
++ 05a4a45d ⚑_ ../repo.feature 05a4a45d 16h Initial commit
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
index a9e7b9986..8845ba28d 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
@@ -10,10 +10,20 @@ info:
CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
+ GIT_ALLOW_PROTOCOL: file
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_AUTHOR_EMAIL: [email protected]
+ GIT_AUTHOR_NAME: Test User
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
- GIT_CONFIG_SYSTEM: /dev/null
+ GIT_COMMITTER_EMAIL: [email protected]
+ GIT_COMMITTER_NAME: Test User
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
@@ -36,6 +46,7 @@ info:
WORKTRUNK_TEST_MOCK_CONFIG_DIR: "[TEST_MOCK_CONFIG]"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
+ WORKTRUNK_TEST_PARENT_SHELL: ""
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
@@ -46,7 +57,7 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
-@ - ⚑^ . 05a4a45d 16h Initial commit
+@ 05a4a45d ⚑^ . 05a4a45d 16h Initial commit
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap b/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
index ed8e3dd18..33428a566 100644
--- a/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
@@ -9,10 +9,20 @@ info:
CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
+ GIT_ALLOW_PROTOCOL: file
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_AUTHOR_EMAIL: [email protected]
+ GIT_AUTHOR_NAME: Test User
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
- GIT_CONFIG_SYSTEM: /dev/null
+ GIT_COMMITTER_EMAIL: [email protected]
+ GIT_COMMITTER_NAME: Test User
+ GIT_CONFIG_COUNT: "2"
+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig
+ GIT_CONFIG_KEY_0: user.useConfigOnly
+ GIT_CONFIG_KEY_1: rerere.enabled
+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig
+ GIT_CONFIG_VALUE_0: "true"
+ GIT_CONFIG_VALUE_1: "false"
GIT_TERMINAL_PROMPT: "0"
HOME: "[TEST_HOME]"
LANG: C
@@ -47,7 +57,7 @@ exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
@ main ^| | . 05a4a45d · ·
-+ - · ·· · · · ../repo.feature 00000000 · ·
++ 00000000 · ·· · · · ../repo.feature 00000000 · ·
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 · ·
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc · ·
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 · ·