Commit Briefs

Omar Polo

got patch: allow to strip path components

Move some bits from the libexec helper to the main process so we know if the patch was generated by git or not and finally document the automatic stripping of a/ and b/ prefixes added by git-diff(1). ok stsp@






Omar Polo

augment patch progress callback with hunks info; recover from errors

Augment got_patch_progress_cb by providing the hunks that were applied with offset (or that failed) and the recoverable error encountered during the operation (bad status, missing file, ...) got_patch now proceeds when a file fails to be patched and exits with GOT_ERR_PATCH_FAILED if no other errors are encountered. While here, also add a test for the 'hunk applied with offset' case and shrink test_patch_dont_apply and illegal_status by taking advantage that 'got patch' doesn't stop at the first error. (And add some other cases to illegal_status too.) discussed with and ok stsp@


Omar Polo

add a dry-run/nop mode for got patch

with lots of help from stsp for the manpage bits!



Stefan Sperling

more 'got patch' man page tweaks


Stefan Sperling

some man page tweaks for 'got patch'

ok op@


Omar Polo

improve `got patch' section of the manpage

Simplify some phrasing, explain what preconditions `got patch' has and what happens to the work tree when an error occurs.



Stefan Sperling

make 'got rm' behave like rm(1) for paths found missing on disk

ok millert@