Skip to content

Release 4 pr - #18

Merged
epcim merged 22 commits into
masterfrom
release-4-pr
Nov 13, 2026
Merged

epcim merged 22 commits into
masterfrom
release-4-pr

Conversation

@epcim

@epcim epcim commented Nov 12, 2026

Copy link
Copy Markdown
Owner

No description provided.

epcim and others added 22 commits November 5, 2026 08:46
…cd/wt path output, help groups, list --raw

Go + Justfile.cross implementations with tests and docs:
- update: concise warning, relative paths; .git pointer file excluded from
  comparisons (whole-repo patches update again)
- compare: {left}/{right} diffTool template (default vim +DirDiffIgnore='.git'),
  cmp alias, fzf/patch-row fallback instead of Usage dump
- diff: pathspec exclude for .git; CWD auto-detect -> fzf -> rows ladder
- cd/wt: print absolute path only (no subshell, no clipboard)
- bare 'git cross' prints local_path<TAB>worktree rows
- help grouped: Repository / Inspect & Navigate / Patch Lifecycle
- list --raw/--no-header (TSV, deterministic order, descriptive headers)
- local_path normalization (./mxc2) at ingestion and matching
- root Justfile: forward args with "$@" (metacharacter-safe)
- tests: new 019/020/021/023 + reworked 003/004/007/009/010/014/016/017/018
Piped output keeps the TAB-separated local_path/worktree contract for
scripts (cut -f1); interactive output space-pads the first column so the
worktree column lines up.
…help order, aligned raw output

- diff: drop ':(exclude).git' pathspec (rejected by older git with a usage
  error); diff a .git-free mirror of the worktree instead (Go + Just)
- compare: default tool is now two vim +cmd args
  'vim "+let g:DirDiffExcludes=.git" "+DirDiff {left} {right}"';
  DirDiffIgnore=... was never a vim command (E492)
- help: use/patch first (Patch Lifecycle group first), authored order kept
- list --raw and bare listing: TTY-aligned columns; piped output stays TSV
- tests: default TESTDIR so NNN.sh can run standalone (014/015 chain-source 001)
- default cross.diffTool: nvim when installed, else vim, invoked as
  "+let g:DirDiffExcludes = '.git'" "+DirDiff {left} {right}"
- git cross --help documents how to reset to the built-in default (--unset)
  and how to pin nvim/vim explicitly with the correct syntax
- tests: 020 asserts the guidance; 021 asserts nvim preference and vim fallback
- docs: README, CHANGELOG, docs/overview.md, AGENTS.md updated
…irDiff

When cross.diffTool is unset, the built-in tool now composes:
  +let g:DirDiffExcludes = '.git[,<DIRDIFF_EXCLUDES>]'   (.git always included)
  +let g:DirDiffIgnore = '\Vkw1\|kw2'                    (only when DIRDIFF_IGNORE is set)
Unset/empty variables omit the corresponding argument. Documented in
git cross --help, README, CHANGELOG and AGENTS; covered by test 021 for
both Go and Just.
- shell-init [bash|zsh|fish] prints crosscd/crosswt wrappers so a real cd
  happens in the caller's shell (a child process cannot change its cwd)
- cd/wt accept --clip (Go) / clip token (Just) to also copy the printed path;
  stdout stays path-only, confirmation on stderr
- help: authored order keeps cd and wt adjacent (regression assertion in 020)
- docs: README quick setup, AGENTS command table, CHANGELOG
…ath docs

- cd/wt no longer accept --clip: shell-init (crosscd/crosswt) provides the real
  cd, making the clipboard workflow obsolete
- copyToClipboard (Go) / _clip (Just) kept isolated and unused for possible reuse
- docs: worktrees are documented only as .cross/worktrees/<remote>_<hash>;
  stale .git/cross/worktrees references fixed in constitution.md and TODO.md;
  no .git/modules or $GIT_DIR layout is documented
- README: concrete on-disk layout diagram for .cross/, Crossfile, local copy
- VERSION, Go binary --version, README badge, CICD tag example -> 0.4.0
- CHANGELOG: consolidate [Unreleased] into [0.4.0] - 2026-11-11 with
  deduplicated Added/Changed/Fixed/Documentation sections; correct the
  .git-exclusion note (mirror, not pathspec); add shell-init, help ordering,
  TTY-aligned listings, root Justfile arg forwarding, harness fixes
…updates

- init enables rerere.enabled in the shared repo config and reports it
  (second run says 'already enabled'); patch enables it silently; update
  re-enables it when missing so pre-existing repos self-heal
- Just init resolves the repo root explicitly, so it never writes global config
- rerere.autoUpdate stays unset (opt-in); replays apply to the worktree only
- README: 'Conflict Resolution Memory (rerere)' section explaining that this
  solves repeated update/conflict resolution; AGENTS implementation note and
  coverage matrix; CHANGELOG folded into 0.4.0
- test/024_rerere.sh: config assertions for Go and Just/Fish plus a real
  resolve-then-replay conflict scenario inside a cross worktree
- completion [fish|bash|zsh|powershell] prints the completion script plus the
  crosscd/crosswt functions; shell defaults to the basename of $SHELL and an
  unknown/undetectable shell exits 1 instead of guessing (fish listed first)
- fish uses 'git cross completion fish | source' (fish 4 executes $(...) and
  joins eval args, so the POSIX eval form does not work there)
- shell-init is now hidden but still functional (wrappers only), keeping the
  visible surface to one command; init prints the shell-appropriate one-liner
  from both Go and Just
- cd/wt help no longer advertises the raw 'cd "$(git cross cd)"' form: they
  only print a path, and without a wrapper the cd happens in a throwaway
  sub-shell. Headlines now point at crosscd/crosswt and custom aliases
- README: shell integration section (fish first), copy-paste generic wrappers
  and alias examples (gccd/gcwt); docs/AGENTS/CHANGELOG updated
- tests 017/020: completion scripts + wrappers, $SHELL detection, hidden
  shell-init, init hints, help grouping
The root help printed the same nvim/vim config line twice. Keep a single
nvim example (the default) and note that replacing nvim with vim pins vim.
test/020 now enforces exactly one config line and no 'Strictly vim' repeat.
Root help now ends with the one-time profile lines:
  git cross completion fish | source   (fish)
  eval "$(git cross completion)"       (bash/zsh)
test/020 asserts both forms are present.
Rows were raw TAB-separated fields, so a long remote (e.g. mxc-library) ran
into the next column and the header never lined up.

- rows are '<local_path padded to width><TAB><local_path>' with
  width = max(local_path)+2 clamped to 16..48
- second column is remote:remote_path, with '(branch)' when branch != main
- header uses the same padding; fzf gets --delimiter \t --with-nth=1 so the
  key is hidden and the selection comes from the last TAB field
- Go (selectPatchInteractive) and Just (_select_patch) emit the identical
  layout for cd/wt/diff/compare; _list_patches machine rows are unchanged
- tests 017/021: new selection contract, shim stdin/args capture, alignment
  assertions with a long remote, branch-suffix case, padded header check
- README picker example, AGENTS implementation note, CHANGELOG in 0.4.0
- update prints only the fact per patch ('<local_path>' differs from upstream;
  local copy preserved) and, after a run that processed any patch, one generic
  path-less review block: 'git cross diff' / 'git cross compare' (both are
  fzf-assisted when no path is given)
- rename the comparison tool key to cross.dirdifftool (it operates on
  directories, matching the DIRDIFF_* env vars); cross.diffTool is still read
  as a deprecated fallback and the new key wins when both are set
- Go + Just emit the same warning/block and the same key lookup order
- tests 004/018/020/021 updated; 009/021 cover the legacy fallback and
  precedence; README documents the migration one-liner
@epcim
epcim merged commit 8bc91f2 into master Nov 13, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants