test: address Copilot review on push-queue helper and hook docs

a9b0334·

Soph·1w ago·1 file·+21 added/-7 removed

• PushQueueRefs: resolve the git common dir via rev-parse like production (checkpoint/pushqueue.go) instead of hard-coding RepoDir/.git, so the helper is correct from linked worktrees
• clarify InstallRealPrePushHook/GitPushArgsWithHooks docs: the wrapper forwards only the remote name, matching the production hook template

Co-Authored-By: Claude Fable 5 noreply@anthropic.com Claude-Session: https://claude.ai/code/session_012yi3hHGAGepwfrfjPETjGq

Sessions

283495b6edfdView transcript

Changes

1

• cmd/entire/cli/integration_test

  • Mtestenv.go+21/-7

1960 unmodified lines

1961
1962
1963
1964
1965
1966
1967
1968
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
59 unmodified lines

2034
2035
2036
2034
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
22 unmodified lines

2073
2074
2075
2063
2076
2077
2078
2079
2080

1960 unmodified lines

}

// InstallRealPrePushHook writes .git/hooks/pre-push so a plain `git push` (no
// --no-verify) runs the checkpoint sync exactly as git runs it: git invokes the
// hook with the remote name ($1) and URL ($2) as argv and feeds
// "<local-ref> <local-sha> <remote-ref> <remote-sha>" lines on stdin. The hook
// inherits the pushing process's environment, so the checkpoint-store and git
// isolation overrides from GitPushWithHooks propagate into it.
// --no-verify) runs the checkpoint sync through a real git-invoked hook: git
// feeds "<local-ref> <local-sha> <remote-ref> <remote-sha>" lines on stdin
// (inherited by the exec'd binary) and passes the remote name ($1) and URL
// ($2) as argv. Like the production hook template (strategy/hooks.go), the
// script forwards only the remote name — `entire hooks git pre-push` does not
take the URL. The hook inherits the pushing process's environment, so the
// checkpoint-store and git isolation overrides from GitPushWithHooks propagate
// into it.
func (env *TestEnv) InstallRealPrePushHook() {
    env.T.Helper()

59 unmodified lines

func (env *TestEnv) PushQueueRefs() []string {
    env.T.Helper()

queuePath := filepath.Join(env.RepoDir, ".git", "entire-checkpoint-push-queue.jsonl")
    // Resolve the common dir like production does (checkpoint/pushqueue.go):
    // in a linked worktree .git is a file and the queue lives in the shared
    // common dir, not under RepoDir/.git.
    cmd := exec.CommandContext(env.T.Context(), "git", "rev-parse", "--path-format=absolute", "--git-common-dir")
    cmd.Dir = env.RepoDir
    cmd.Env = testutil.GitIsolatedEnv()
    commonDirOut, err := cmd.Output()
    if err != nil {
        env.T.Fatalf("resolve git common dir: %v", err)
    }
    queuePath := filepath.Join(strings.TrimSpace(string(commonDirOut)), "entire-checkpoint-push-queue.jsonl")
    data, err := os.ReadFile(queuePath) //nolint:gosec // G304: path built from test env, not user input
    if errors.Is(err, os.ErrNotExist) {
        return nil
    }
22 unmodified lines
}

// GitPushArgsWithHooks installs the pre-push hook and runs `git push <args>`
// (WITHOUT --no-verify) so the real hook fires exactly as git runs it, then
// (WITHOUT --no-verify) so the real git-invoked hook fires (see
// InstallRealPrePushHook for its fidelity notes), then
// returns the combined output and any error instead of failing the test. Use it
// for push shapes GitPushWithHooks can't express — a `--delete` (zero-sha stdin),
// a tag-only push, or an expected graceful-degradation exit code.