Commit Graph

91 Commits

Author SHA1 Message Date
Chris Bookholt
653b79082c test(git): expose three-way apply failures 2026-07-03 16:31:36 -07:00
Chris Bookholt
49664d3c75 codex/git: isolate three-way reverse staging 2026-07-03 16:13:55 -07:00
Chris Bookholt
76b98f3eda Merge commit '899d640254c4b77ea901f7b86411f126f93300dc' into codex/psec-4394-git-06-merge-guard 2026-07-02 08:03:37 -07:00
Chris Bookholt
899d640254 ci(git-utils): shard unit tests 2026-07-02 08:02:20 -07:00
Chris Bookholt
8cc31d9b53 test(git-utils): align merge guard tests with conventions 2026-07-02 07:45:18 -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
8bf42f52f7 Merge exact-staging guard into merge-driver guard 2026-07-02 05:48:11 -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
09c7e504ae Merge commit '2b8ce702a715059adc338c5b098b72ae4fdb2089' into codex/psec-4394-git-06-merge-guard 2026-07-02 02:59:51 -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
Chris Bookholt
4430c51039 git-utils: fix Windows repository authority tests 2026-07-01 23:07:18 -07:00
Chris Bookholt
9c0e48eba6 git-utils: fix Windows repository authority checks 2026-07-01 22:27:54 -07:00
Chris Bookholt
bf70395505 git-utils: make registry retarget test deterministic 2026-07-01 21:42:21 -07:00
Chris Bookholt
daca14580c git-utils: fix Windows authority build 2026-07-01 21:30:49 -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
51ee6d1955 Merge commit '17f491ab674d00026b4481d9ef373782bdf6a332' into codex/psec-4394-git-06-merge-guard
# Conflicts:
#	codex-rs/git-utils/src/patch_paths.rs
2026-07-01 19:02:20 -07:00
Chris Bookholt
17f491ab67 git-utils: stage patch paths without recursive add 2026-07-01 18:57:30 -07:00
Chris Bookholt
9a21b607e3 Merge branch 'codex/psec-4394-git-02-effective-patch-paths' into codex/psec-4394-git-03-path-containment 2026-07-01 16:50:50 -07:00
Chris Bookholt
f303ab00da Merge commit '300bbcbf5c' into codex/psec-4394-git-02-effective-patch-paths 2026-07-01 16:50:46 -07:00
Chris Bookholt
300bbcbf5c git-utils: clarify raw PATH rejection 2026-07-01 16:50:40 -07:00
Chris Bookholt
efbd215b81 Merge branch 'codex/psec-4394-git-02-effective-patch-paths' into codex/psec-4394-git-03-path-containment 2026-07-01 16:49:45 -07:00
Chris Bookholt
1ea2e7fcc4 Merge commit 'edda59a703' into codex/psec-4394-git-02-effective-patch-paths 2026-07-01 16:49:32 -07:00
Chris Bookholt
edda59a703 git-utils: fix Windows traversal regression test 2026-07-01 16:49:19 -07:00
Chris Bookholt
4761533064 git-utils: fix direct reverse apply reporting 2026-07-01 16:38:24 -07:00
Chris Bookholt
d98e980a31 git-utils: scope filter test helpers to tests 2026-07-01 16:34:53 -07:00
Chris Bookholt
d3be0bb9ba Merge commit 'f2874f80f9bed1a1c8721322987ca30823459ac2' into codex/psec-4394-git-06-merge-guard 2026-07-01 16:24:28 -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
f2874f80f9 Merge branch 'codex/psec-4394-git-05a-apply-filters' into codex/psec-4394-git-05b-stage-filters 2026-07-01 16:21:28 -07:00
Chris Bookholt
68da17b9d8 Merge branch 'codex/psec-4394-git-03-path-containment' into codex/psec-4394-git-05a-apply-filters 2026-07-01 16:21:13 -07:00
Chris Bookholt
21bcee35e4 Merge branch 'codex/psec-4394-git-02-effective-patch-paths' into codex/psec-4394-git-03-path-containment 2026-07-01 16:21:00 -07:00
Chris Bookholt
e76a347987 Merge branch 'codex/psec-4394-trusted-git-runner' into codex/psec-4394-git-02-effective-patch-paths 2026-07-01 16:20:46 -07:00
Chris Bookholt
f062f6916e git-utils: reject raw Windows PATH traversal 2026-07-01 16:20:33 -07:00