Commit Graph

17 Commits

Author SHA1 Message Date
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
09c7e504ae Merge commit '2b8ce702a715059adc338c5b098b72ae4fdb2089' into codex/psec-4394-git-06-merge-guard 2026-07-02 02:59:51 -07:00
Chris Bookholt
34f1bb3ee0 git-utils: integrate exact staging with repository authority 2026-07-02 01:42:30 -07:00
Chris Bookholt
e8b30bd7d3 git-utils: integrate filter guards with repository authority 2026-07-02 00:46:29 -07:00
Chris Bookholt
f751377d1e git-utils: harden reverse patch staging 2026-07-01 19:14:52 -07:00
Chris Bookholt
17f491ab67 git-utils: stage patch paths without recursive add 2026-07-01 18:57:30 -07:00
Chris Bookholt
19a85ed470 git-utils: normalize required filter booleans 2026-07-01 16:13:43 -07:00
Chris Bookholt
9dcd750de7 Merge apply filter neutralization into staging guard 2026-07-01 16:09:25 -07:00
Chris Bookholt
edce1cb0c5 git-utils: refine staging filter policy 2026-07-01 16:00:25 -07:00
Chris Bookholt
db8a0aeadf git-utils: block selected filters before staging 2026-07-01 10:43:30 -07:00
Chris Bookholt
c21e78bbd6 git-utils: normalize Windows junction test paths 2026-07-01 10:20:33 -07:00
Chris Bookholt
4c0a1feded git-utils: consume confined staging candidates 2026-07-01 09:57:14 -07:00
Chris Bookholt
7cdf6b09bc git-utils: confine staged paths to the worktree 2026-07-01 09:34:06 -07:00
Chris Bookholt
843f07e265 Derive effective patch paths through Git 2026-07-01 08:37:37 -07:00