Commit Briefs


Josh Rickmar

Make got_worktree_get_base_ref_name static

Nothing appears to benefit from this being non-static, and it was missing from the public API headers as well. ok stsp@


Josh Rickmar

Define apply_umask earlier, without predeclaration

ok op@




James Cook

fix option processing for 'got merge'

Don't make -C imply -c (a break statement was missing). Detect -an and -cn conflicts. Simplify by removing unneeded check for conflicting -aC (since -C requires -c, we can rely on the -ac conflict being detected). Update the man page to say -cC is allowed.


James Cook

add -M option: tell got merge not to fast-forward

ok stsp@


Omar Polo

bubble up got_repo_commits()

now that got_get_repo_commits() doesn't look at `action' we can stop fetching the commits during the rendering and bubble up the call. This yields better error messages and better replies codes on failure.



Christian Weisgerber

use _POSIX_HOST_NAME_MAX from <limits.h> for portability

ok stsp


Stefan Sperling

bump version number


Stefan Sperling

CHANGES for 0.90 (tags/0.90)



Stefan Sperling

fix cleanup progress reporting output


Stefan Sperling

show the path of a lock file when locking it fails

before: gotadmin: lockfile timeout after: gotadmin: gc.pid.lock: lockfile timeout