Commit Graph
108 Commits
Author SHA1 Message Date
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 6602a13645 Merge commit '17446f56e9' into codex/psec-4394-git-05a-apply-filters 2026-07-06 16:14:09 -07:00
Chris Bookholt 17446f56e9 Merge commit '26ce6873cd' into codex/psec-4394-git-04d-guarded-apply 2026-07-06 16:13:42 -07:00
Chris Bookholt 26ce6873cd test(git): assert Windows sharing violation 2026-07-06 16:13:28 -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 a7bcf8c1a2 Merge branch 'codex/psec-4394-git-04a-config-env' into codex/psec-4394-git-04b-primary-config-authority 2026-07-03 20:32:40 -07:00
Chris Bookholt f6adc9fbcc fix(git): preserve patch parsing compatibility 2026-07-03 20:32:11 -07:00
Chris Bookholt 6b986f98ea Merge branch 'codex/psec-4394-git-05a-apply-filters' into codex/psec-4394-git-05b-stage-filters 2026-07-03 20:12:18 -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 cc35a0c884 fix(git): accept empty config count 2026-07-03 20:10:31 -07:00
Chris Bookholt 7311b9f007 Merge branch 'codex/psec-4394-git-04d-guarded-apply' into codex/psec-4394-git-05a-apply-filters 2026-07-03 19:55:34 -07:00
Chris Bookholt fce28dc63f Merge branch 'codex/psec-4394-git-04c-include-config-authority' into codex/psec-4394-git-04d-guarded-apply 2026-07-03 19:54:43 -07:00
Chris Bookholt 380d6ebd62 test(git): respect Windows repository handle pinning 2026-07-03 19:53:49 -07:00
Chris Bookholt ea3a1c1d4d Merge branch 'codex/psec-4394-git-04d-guarded-apply' into codex/psec-4394-git-05a-apply-filters 2026-07-03 19:16:58 -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 a61016c0bd Merge branch 'codex/psec-4394-git-04c-include-config-authority' into codex/psec-4394-git-04d-guarded-apply 2026-07-03 19:08:47 -07:00
Chris Bookholt 7f043fda30 Merge branch 'codex/psec-4394-git-04b-primary-config-authority' into codex/psec-4394-git-04c-include-config-authority 2026-07-03 19:08:36 -07:00
Chris Bookholt 409f1f78e7 test(git): allow staged Windows helper 2026-07-03 19:08:26 -07:00
Chris Bookholt d018906d57 Merge branch 'codex/psec-4394-git-04c-include-config-authority' into codex/psec-4394-git-04d-guarded-apply 2026-07-03 18:56:20 -07:00
Chris Bookholt 9d8d964f7d Merge branch 'codex/psec-4394-git-04b-primary-config-authority' into codex/psec-4394-git-04c-include-config-authority 2026-07-03 18:56:05 -07:00
Chris Bookholt 7500615875 Merge branch 'codex/psec-4394-git-04a-config-env' into codex/psec-4394-git-04b-primary-config-authority 2026-07-03 18:55:52 -07:00
Chris Bookholt f6b6a4951f fix(git): allow staged config accessor 2026-07-03 18:55:35 -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 21ca43303b fix(git): bind configuration environment 2026-07-03 18:29:53 -07:00
Chris Bookholt 809d6129a3 test(git): allow platform-specific staging hook 2026-07-03 17:52:35 -07:00
Chris Bookholt 92d1967d21 fix(git): bind staging to repository authority 2026-07-03 17:31:39 -07:00
Chris Bookholt 6b40c77a0f fix(git-utils): parse Git boolean syntax consistently 2026-07-03 15:55:43 -07:00
Chris Bookholt 899d640254 ci(git-utils): shard unit tests 2026-07-02 08:02:20 -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 993d488f75 Merge apply-filter guard into exact staging guard 2026-07-02 05:18:32 -07:00
Chris Bookholt 53519625bd Merge repository-authority runner reuse into apply-filter guard 2026-07-02 05:04:35 -07:00
Chris Bookholt 10948913cd test(git-utils): gate Unix-only merge-base imports 2026-07-02 04:48:32 -07:00
Chris Bookholt d43fab9464 fix(git-utils): reuse runner for merge-base 2026-07-02 04:33:41 -07:00
Chris Bookholt 2b8ce702a7 Merge commit '97dee6c2b8' into codex/psec-4394-git-05b-stage-filters 2026-07-02 01:58:57 -07:00
Chris Bookholt 97dee6c2b8 git-utils: fix Windows test import guards 2026-07-02 01:58:34 -07:00
Chris Bookholt 3e4c7d6380 Merge commit 'fab7d5a1e6aeebabdca0cea4dd09b5f9ad1a2d4e' into codex/psec-4394-git-05b-stage-filters 2026-07-02 01:42:45 -07:00
Chris Bookholt 34f1bb3ee0 git-utils: integrate exact staging with repository authority 2026-07-02 01:42:30 -07:00
Chris Bookholt fab7d5a1e6 git-utils: fix Windows authority and test fixtures 2026-07-02 01:33:44 -07:00
Chris Bookholt 5632dfd765 git-utils: support older Git boolean ranges 2026-07-02 01:01:44 -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 7a4648aff4 git-utils: normalize junction fixture paths 2026-07-01 23:42:37 -07:00
Chris Bookholt 5a95b65f57 git-utils: gate Unix-only authority fixtures 2026-07-01 23:19:38 -07:00