Commit Briefs

Omar Polo

refactor apply_patch to support renaming files

add two helper functions (schedule_add, schedule_del) and move the guts of apply_patch into a new function `patch_file'. This simplifies apply_patch and makes easier to figure out what happens. Then, drop GOT_ERR_PATCH_PATHS_DIFFER since we allow the to rename files.



Omar Polo

improve error message due to malformed `author' in got.conf

tweak and ok stsp@



Stefan Sperling

for portability, handle errno variations upon open(2) failure with O_NOFOLLOW

Problem pointed out by naddy for FreeBSD -portable. Discussed with millert, thomas adam, and naddy.


Stefan Sperling

add a 'got merge' command for creating merge commits

Additional testing by Thomas Adam. ok tracey


Stefan Sperling

add 'got send' command for sending changes to remote repositories

Known to work against git-daemon and github Git server implementations. Tests by abieber, naddy, jrick, and myself. Man page additions reviewed by Lucas.




Stefan Sperling

handle pack index files which lack a corresponding pack file

ok millert



Stefan Sperling

add got_error_fmt()

got_error_fmt() could eventually replace got_error_path() which has already been used to construct errors with strings that are not actually paths... ok millert@


Stefan Sperling

add got_error_from_errno_fmt() for more flexibility in error messages

suggested by and ok millert


Stefan Sperling

detect unknown repository format extensions (such as sha256 format)

ok millert


Stefan Sperling

add got.conf(5) configuration file

ok tracey