Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/CICD.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ Added to README.md header:
### Creating a Release
```bash
# Tag and push
git tag v0.2.1
git push origin v0.2.1
git tag v0.2.2
git push origin v0.2.2

# GitHub Actions will automatically:
# 1. Create a release
Expand Down
1 change: 1 addition & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Testing is modular and targets each implementation:
- **Bash/Fish**: `test/run-all.sh` executes legacy shell tests.
- **Rust**: `test/008_rust_cli.sh` verifies the Rust port.
- **Go**: `test/009_go_cli.sh` verifies the Go implementation.
- **Integration Coverage**: Every new test must execute against all implementations (Justfile.cross, Go CLI, Rust CLI). Use the `just cross-test <id>` harness and mirror the multi-implementation pattern from tests like `test/019_patch_worktree.sh`.

For known issues and planned enhancements, see [TODO.md](TODO.md).

Expand Down
24 changes: 22 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.2.2] - 2026-01-22

### Added
- **Independent worktree support** across Just, Go, and Rust implementations
- Automatically resolves the shared `.git` directory when running from `git worktree` checkouts
- Honors `CROSSDIR` / `METADATA` environment overrides for automation and tests
- Synchronizes metadata and worktrees into the primary repository rather than the linked worktree
- **Historical coverage** for worktree usage via `test/019_patch_worktree.sh`, executed for all implementations

### Fixed
- `git cross patch` (Go/Rust) now builds worktree paths from the shared git directory instead of assuming `.git/`
- `Justfile.cross` sync, diff, and push targets normalize paths to absolute locations, eliminating rsync failures inside worktrees

### Documentation
- README highlights worktree support and environment overrides introduced in v0.2.2
- Updated release instructions and agent docs to reference v0.2.2

### Testing
- Reworked `test/019_patch_worktree.sh` to provision branches safely, reuse helper utilities, and validate all three implementations from independent worktrees

## [0.2.1] - 2026-01-06

### Added
Expand All @@ -16,7 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Excludes 'origin' and 'git-cross' from cleanup
- Runs `git worktree prune` to clean stale worktrees
- Implemented across all three implementations (Just, Go, Rust)
- Full test coverage in `test/015_prune.sh`
- Full test coverage in `test/030_prune.sh`

### Fixed
- **Sync command file deletion logic** - Only delete tracked files removed upstream
Expand All @@ -39,7 +59,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Testing
- Enhanced `test/004_sync.sh` with 6 comprehensive scenarios
- Added `test/015_prune.sh` with 3 test scenarios
- Added `test/030_prune.sh` with 3 test scenarios
- All tests pass for Just, Go, and Rust implementations

## [0.2.0] - 2025-12-01
Expand Down
1 change: 1 addition & 0 deletions Crossfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ cross sync

cross use khue https://github.com/khuedoan/homelab
cross patch khue:master:/metal deploy/metal
cross patch this:f5cs-dnsFromXc-deploy-lib:ongoing/f5xc-tenants/ves-sre/f5cs-dns ongoing/f5xc-tenants/ves-sre/f5cs-dns
11 changes: 9 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ import? "git.just"
# Delegate all invocations to the full recipe set
[no-cd]
@cross *ARGS:
REPO_DIR=$(git rev-parse --show-toplevel) \
echo "{{source_dir()}}/Justfile.cross"; \
REPO_DIR=$(git rev-parse --show-toplevel); \
CROSSDIR="$(git rev-parse --path-format=absolute --git-common-dir)/cross"; \
METADATA="$CROSSDIR/metadata.json"; \
export REPO_DIR CROSSDIR METADATA; \
just --justfile "{{source_dir()}}/Justfile.cross" {{ARGS}}

# keep compatibility with `just test-cross`
[no-cd]
@cross-test *ARGS:
REPO_DIR=$(git rev-parse --show-toplevel) \
REPO_DIR=$(git rev-parse --show-toplevel); \
CROSSDIR="$(git rev-parse --path-format=absolute --git-common-dir)/cross"; \
METADATA="$CROSSDIR/metadata.json"; \
export REPO_DIR CROSSDIR METADATA; \
just --justfile "{{source_dir()}}/Justfile.cross" test "{{ARGS}}"

# Run the Rust implementation
Expand Down
Loading
Loading