Commit Graph
37 Commits
Author SHA1 Message Date
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 8745d144d4 Merge commit '6602a13645c5c167fb14dae5403b489ffe806542' into codex/psec-4394-git-05b-stage-filters
# Conflicts:
#	codex-rs/git-utils/src/patch_paths.rs
2026-07-06 16:26:41 -07:00
Chris Bookholt 1e95101009 Merge commit '39b48cbd26fd3e365705aa2d74403e4c46a77f2e' into codex/psec-4394-git-05a-apply-filters 2026-07-06 16:08:25 -07:00
Chris Bookholt 39b48cbd26 Merge commit '289b572dd0ac7038531cb5b9e197fd73a523b492' into codex/psec-4394-git-04d-guarded-apply
# Conflicts:
#	codex-rs/git-utils/src/apply.rs
#	codex-rs/git-utils/src/patch_paths.rs
2026-07-06 16:07:14 -07:00
Chris Bookholt 143d2f56c8 Merge commit 'a69db7b619bf380327fc7369dd2b0fc98590314d' into codex/psec-4394-git-04c-include-config-authority
# Conflicts:
#	codex-rs/git-utils/src/apply.rs
#	codex-rs/git-utils/src/patch_paths.rs
2026-07-06 15:54:02 -07:00
Chris Bookholt c56bd60054 fix(git): reject process-relative procfs config 2026-07-06 15:27:36 -07:00
Chris Bookholt f6adc9fbcc fix(git): preserve patch parsing compatibility 2026-07-03 20:32:11 -07:00
Chris Bookholt 79728df6d2 Merge branch 'codex/psec-4394-git-05a-apply-filters' into codex/psec-4394-git-05b-stage-filters
# Conflicts:
#	codex-rs/git-utils/src/apply.rs
#	codex-rs/git-utils/src/patch_paths.rs
2026-07-03 20:12:08 -07:00
Chris Bookholt 62c56ee3ac Merge branch 'codex/psec-4394-git-04d-guarded-apply' into codex/psec-4394-git-05a-apply-filters
# Conflicts:
#	codex-rs/git-utils/src/apply.rs
#	codex-rs/git-utils/src/git_command.rs
#	codex-rs/git-utils/src/git_config.rs
#	codex-rs/git-utils/src/git_config_sources/primary_sources.rs
#	codex-rs/git-utils/src/git_config_sources_tests.rs
#	codex-rs/git-utils/src/git_config_tests.rs
#	codex-rs/git-utils/src/guarded_config.rs
#	codex-rs/git-utils/src/guarded_config_tests.rs
#	codex-rs/git-utils/src/patch_paths.rs
#	codex-rs/git-utils/src/patch_paths_tests.rs
#	codex-rs/git-utils/src/repository_authority/authority.rs
2026-07-03 19:15:58 -07:00
Chris Bookholt 463eed4400 fix(git): bind guarded patch operations 2026-07-03 18:36:13 -07:00
Chris Bookholt 9c2e1342a4 fix(git): authorize included config sources 2026-07-03 18:34:27 -07:00
Chris Bookholt 3e1688f2cb fix(git): authorize primary config sources 2026-07-03 18:32:25 -07:00
Chris Bookholt 49664d3c75 codex/git: isolate three-way reverse staging 2026-07-03 16:13:55 -07:00
Chris Bookholt 70586d72e5 Merge commit 'f047aa7f31837b0ea65ec1ea914d32d2162b6796' into codex/psec-4394-git-06-merge-guard 2026-07-02 07:25:08 -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 f047aa7f31 test(git-utils): isolate filter policy cardinality tests 2026-07-02 07:22:29 -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
Chris Bookholt 09c7e504ae Merge commit '2b8ce702a715059adc338c5b098b72ae4fdb2089' into codex/psec-4394-git-06-merge-guard 2026-07-02 02:59:51 -07:00
Chris Bookholt e8b30bd7d3 git-utils: integrate filter guards with repository authority 2026-07-02 00:46:29 -07:00
Chris Bookholt 801018897f Merge repository authority into apply filter guard 2026-07-02 00:16:26 -07:00
Chris Bookholt bcf026cbca git-utils: centralize repository authority and trusted Git launch 2026-07-01 21:19:17 -07:00
Chris Bookholt f751377d1e git-utils: harden reverse patch staging 2026-07-01 19:14:52 -07:00
Chris Bookholt 4761533064 git-utils: fix direct reverse apply reporting 2026-07-01 16:38:24 -07:00
Chris Bookholt 1c13ea9533 git-utils: close merge-driver apply races 2026-07-01 16:24:15 -07:00
Chris Bookholt 01706485c3 Merge branch 'codex/psec-4394-git-05b-stage-filters' into codex/psec-4394-git-06-merge-guard
# Conflicts:
#	codex-rs/git-utils/src/apply.rs
2026-07-01 16:22:49 -07:00
Chris Bookholt bed78fad06 git-utils: neutralize off-path filter helpers 2026-07-01 15:58:52 -07:00
Chris Bookholt 4bf391509e Merge branch 'codex/psec-4394-git-03-path-containment' into codex/psec-4394-git-05a-apply-filters
# Conflicts:
#	codex-rs/git-utils/src/apply.rs
2026-07-01 15:25:38 -07:00
Chris Bookholt 6a7530f161 Merge branch 'codex/psec-4394-trusted-git-runner' into codex/psec-4394-git-02-effective-patch-paths 2026-07-01 15:23:52 -07:00
Chris Bookholt 9ec1720f7c git-utils: reject Git from enclosing repositories 2026-07-01 15:22:59 -07:00
Chris Bookholt 5b1fe8c0f2 git-utils: fix selected filter edge cases 2026-07-01 15:17:42 -07:00
Chris Bookholt 49a1515c1a git-utils: gate selected merge drivers before three-way apply 2026-07-01 11:12:26 -07:00
Chris Bookholt 0b84913ea8 git-utils: block selected patch filters 2026-07-01 10:21:29 -07:00
Chris Bookholt 843f07e265 Derive effective patch paths through Git 2026-07-01 08:37:37 -07:00
Chris Bookholt 2ca4f55c0d Bind Git worktree helpers to a trusted executable 2026-07-01 07:45:11 -07:00
Chris Bookholt f6122dbf59 Deny transport for local-only Git operations 2026-06-29 15:46:01 -07:00
0f957a93cd Move git utilities into a dedicated crate (#15564)
- create `codex-git-utils` and move the shared git helpers into it with
file moves preserved for diff readability
- move the `GitInfo` helpers out of `core` so stacked rollout work can
depend on the shared crate without carrying its own git info module

---------

Co-authored-by: Ahmed Ibrahim <219906144+aibrahim-oai@users.noreply.github.com>
Co-authored-by: Codex <noreply@openai.com>
2026-03-24 13:26:23 -07:00