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


Omar Polo

simplify gotwebd' server matching

Currently, if there is not a match on the server name, it attempts to match the "subdomain" against the server names, and fall back to the first server defined. The server name is taken from the SERVER_NAME fastcgi' parameter, the subdomain extracted from HTTP_HOST. Keep only the SERVER_NAME matching, but still use the first server defined if there's no match. Fix the manpage documenting how matching works and drop the lie about SNI as gotwebd doesn't do TLS but just looks at what the upstream http server decided. ok stsp@


Omar Polo

gotd: wait asynchronously for children termination

Instead of the current kill() + waitpid(WNOHANG), manage the subprocesses in a separate queue and handle SIGCHLD. A timer is installed to ensure that misbehaving subprocesses are still killed. Fixes the current "child PID 0 terminated" logs due to races with waitpid(). Issue initially reported by Josiah Frentsos. ok + tweaks stsp@



Tracey Emery

Fix for cc1: warnings being treated as errors

/home/got/src/got/tog/tog.c: In function 'draw_tree_entries': /home/got/src/got/tog/tog.c:7307: warning: comparisons like X<=3DY<=3DZ do = not have their mathematical meaning


Omar Polo

add kill_repo_proc() similarly to the other kill_*_proc()

ok stsp@


Stefan Sperling

reword user-facing error message which mentions "fast-forward"

For user-facing messages it is better to avoid technical jargon like this and instead spell out what the fast-forward situation implies: that one branch is already based on another. ok jamsek


Mark Jamsek

typo


Omar Polo

missing semicolon... sigh

I can't assume I can blindly add one simple line.


Omar Polo

move gotd_child_proc to gotd.c

make it opaque since it's unused outside of gotd.c. While here, drop the unused `nhelpers' field. ok/tweak stsp@