diff options
| author | Jesse Vincent <jesse@fsck.com> | 2026-10-23 03:47:21 +0000 |
|---|---|---|
| committer | Jesse Vincent <jesse@fsck.com> | 2026-10-23 03:48:33 +0000 |
| commit | f713233eee9143d0a798976fd0d11609f91c0b5c (patch) | |
| tree | 4aa32416b4a63178f738f17ecbfb82fd5d520310 /tests/codex-plugin-sync/test-sync-to-codex-plugin.sh | |
| parent | b58deb3b948d4c305feeac122700100419ee2777 (diff) | |
fix(codex): accept linked git worktrees as checkoutsfix/codex-scripts-in-worktrees
package-codex-plugin.sh and sync-to-codex-plugin.sh checked for a
checkout with [[ -d .git ]]. In a linked worktree .git is a file, so
both scripts died with "not a git checkout" there, and
tests/codex/test-package-codex-plugin.sh failed 9 checks when run from
any worktree. Test that .git exists instead: it covers both layouts
and still requires the path to be the root of a checkout, which
matters for sync's user-supplied --local path. The scripts' later git
commands already work in worktrees.
Regression tests run the package script from a linked worktree of the
repo, and a sync preview from a linked upstream worktree into a linked
destination worktree. The package test is adapted from #1910.
Co-authored-by: tianma-if <tianma-if@users.noreply.github.com>
Claude-Session: https://claude.ai/code/session_01SHANcr4A71nzuU9et4Fnba
Diffstat (limited to 'tests/codex-plugin-sync/test-sync-to-codex-plugin.sh')
| -rwxr-xr-x | tests/codex-plugin-sync/test-sync-to-codex-plugin.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/tests/codex-plugin-sync/test-sync-to-codex-plugin.sh b/tests/codex-plugin-sync/test-sync-to-codex-plugin.sh index 84282c2..fb3aaa7 100755 --- a/tests/codex-plugin-sync/test-sync-to-codex-plugin.sh +++ b/tests/codex-plugin-sync/test-sync-to-codex-plugin.sh @@ -571,6 +571,12 @@ main() { local bootstrap_output local missing_manifest_status local missing_manifest_output + local linked_upstream_main + local linked_upstream + local linked_dest_main + local linked_dest + local linked_preview_status + local linked_preview_output local mixed_only_status local mixed_only_output local stale_preview_status @@ -603,6 +609,10 @@ main() { dest_branch="fixture/preview-target" bootstrap_dest_branch="fixture/bootstrap-preview-target" fake_bin="$TEST_ROOT/bin" + linked_upstream_main="$TEST_ROOT/linked-upstream-main" + linked_upstream="$TEST_ROOT/linked-upstream" + linked_dest_main="$TEST_ROOT/linked-destination-main" + linked_dest="$TEST_ROOT/linked-destination" init_repo "$upstream" write_upstream_fixture "$upstream" @@ -635,6 +645,17 @@ main() { write_bootstrap_destination_fixture "$bootstrap_dest" checkout_fixture_branch "$bootstrap_dest" "$bootstrap_dest_branch" + # The sync script wants upstream on main, so park the primary checkout + # on another branch and check main out in the linked worktree. + init_repo "$linked_upstream_main" + write_upstream_fixture "$linked_upstream_main" + git -C "$linked_upstream_main" switch -q -c fixture/parked + git -C "$linked_upstream_main" worktree add -q "$linked_upstream" main + + init_repo "$linked_dest_main" + write_destination_fixture "$linked_dest_main" + git -C "$linked_dest_main" worktree add -q -b fixture/linked-target "$linked_dest" + write_fake_gh "$fake_bin" # This regression test is about dry-run content, so capture the preview @@ -654,6 +675,8 @@ main() { noop_apply_status=$? missing_manifest_output="$(run_preview_without_manifest "$upstream" "$dest" "$fake_bin")" missing_manifest_status=$? + linked_preview_output="$(run_preview "$linked_upstream" "$linked_dest" "$fake_bin")" + linked_preview_status=$? set -e help_output="$(run_help "$upstream" "$fake_bin")" script_source="$(cat "$upstream/scripts/sync-to-codex-plugin.sh")" @@ -731,6 +754,11 @@ Locally modified fixture content." "Dirty local apply preserves tracked working- short_description: \"Destination-owned OpenAI metadata\"" "Clean no-op local apply preserves OpenAI agent metadata" echo "" + echo "Linked worktree assertions..." + assert_equals "$linked_preview_status" "0" "Preview from a linked worktree into a linked worktree exits successfully" + assert_not_contains "$linked_preview_output" "is not a git checkout" "Linked worktrees are accepted as git checkouts" + + echo "" echo "Missing manifest assertions..." assert_equals "$missing_manifest_status" "1" "Missing manifest exits with failure" assert_contains "$missing_manifest_output" "ERROR: committed Codex manifest missing at" "Missing manifest reports committed manifest path" |
