Log in

Commit bd39a563

bd39a563b7f5

Merged on mrmrs-0aad77
mrmrs · 1 month ago · 3 files ~3 modified
M suites/robustness/README.md
@@ -114,7 +114,11 @@
114114 subcommand or `--continue/--abort`), an explicit manual step ("remove the
115115 file manually"), a documented retryable condition, `recommended_next_commands`,
116116 or a specific (non-generic) JSON error code. Mentioning "oak"/"git" is not
117- enough. Git's normal outcomes "Automatic merge failed; fix conflicts and
117+ enough. Corruption / internal / opaque-store wording (malformed, corrupt,
118+ bad or invalid object, unable to read sha1 file/tree, early EOF, segfault,
119+ empty object file, HTTP 500, "unable to open database file", "not a git
120+ repository") is checked first and makes the failure non-actionable even
121+ when it also names a recovery command. Git's normal outcomes "Automatic merge failed; fix conflicts and
118122 then commit the result." and "Not possible to fast-forward, aborting." are
119123 actionable only for the git subject and only when every output line is one
120124 of git's ordinary merge/pull lines (Auto-merging, CONFLICT, hint:, From,