Commit Graph
8 Commits
Author SHA1 Message Date
Chris Bookholt 8a1ad221fa Merge three-way safeguards and harden frozen Git status reads 2026-07-06 21:12:53 -07:00
Chris Bookholt fd873645bf Merge commit '8745d144d4' into codex/psec-4394-git-06-merge-guard
# Conflicts:
#	codex-rs/git-utils/src/apply.rs
2026-07-06 18:55:29 -07:00
Chris Bookholt 49664d3c75 codex/git: isolate three-way reverse staging 2026-07-03 16:13:55 -07:00
Chris Bookholt 932d5c3d38 chore(git-utils): satisfy final lint gates 2026-07-02 08:29:47 -07:00
Chris Bookholt d95ace063e Merge commit '8cc31d9b53027d74e5cf07f0212326785e0aa847' into codex/psec-4396-git-07-status-guard
# Conflicts:
#	codex-rs/git-utils/src/errors.rs
#	codex-rs/git-utils/src/git_command.rs
#	codex-rs/git-utils/src/safe_git.rs
#	codex-rs/git-utils/src/safe_git_tests.rs
2026-07-02 08:14:12 -07:00
Chris Bookholt 90801721ce Merge exact-staging authorization into merge-driver guard
# Conflicts:
#	codex-rs/git-utils/src/apply.rs
#	codex-rs/git-utils/src/patch_paths.rs
#	codex-rs/git-utils/src/safe_git.rs
#	codex-rs/git-utils/src/safe_git_tests.rs
2026-07-02 07:25:00 -07:00
Chris Bookholt 6da314e14f Merge operation-scoped config authorization into exact staging
# Conflicts:
#	codex-rs/git-utils/src/safe_git.rs
#	codex-rs/git-utils/src/safe_git_tests.rs
2026-07-02 06:51:31 -07:00
Chris Bookholt 30d7a76254 git-utils: scope config authorization to apply operations 2026-07-02 06:16:32 -07:00