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@

diff | patch | tree

Josh Rickmar

Define apply_umask earlier, without predeclaration

ok op@

diff | patch | tree

Stefan Sperling

consistently mention 'got merge' as an alternative to 'got rebase' in got.1

diff | patch | tree

James Cook

histedit, rebase: document -c, -C are compatible

diff | patch | tree

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.

diff | patch | tree

James Cook

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

ok stsp@

diff | patch | tree

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.

diff | patch | tree

Omar Polo

drop hack; got_get_repo_commits() doesn't look at action anymore

diff | patch | tree

Christian Weisgerber

use _POSIX_HOST_NAME_MAX from <limits.h> for portability

ok stsp

diff | patch | tree

Stefan Sperling

bump version number

diff | patch | tree

Stefan Sperling

CHANGES for 0.90 (tags/0.90)

diff | patch | tree

Stefan Sperling

rate-limit redundant pack cleanup progress output

diff | patch | tree

Stefan Sperling

fix cleanup progress reporting output

diff | patch | tree

Stefan Sperling

show the path of a lock file when locking it fails

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

diff | patch | tree

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@

diff | patch | tree