Commit Briefs

87c986b7f0 Thomas Adam

fix broken sentence in got.1 (was missing a word)


fcfaa6d583 Thomas Adam

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@


a807c50bd1 Thomas Adam

Define apply_umask earlier, without predeclaration

ok op@



79878eb8ee Thomas Adam

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


dcd455ee64 Thomas Adam

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.


31009ade0d Thomas Adam

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

ok stsp@


3ef3f36a26 Omar Polo

sync imsg with base


f590993607 Thomas Adam

portable: set next version


4faaaabc54 Thomas Adam

portable: release 0.90 (tags/0.90)


b2251e6e28 Thomas Adam

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.



0fc3012cbe Thomas Adam

Revert "portable: HOST_NAME_MAX"

This reverts commit 0835bf10ee863d91a617270780cd79c405c6a992.


cf7804ed4e Thomas Adam

use _POSIX_HOST_NAME_MAX from <limits.h> for portability

ok stsp


f7f5daf01e Thomas Adam

bump version number


4cbbb7652d Thomas Adam

CHANGES for 0.90


f116c762e7 Thomas Adam

rate-limit redundant pack cleanup progress output


91554d234c Thomas Adam

fix cleanup progress reporting output


e8f803b5e0 Thomas Adam

show the path of a lock file when locking it fails

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


b95d1cf6b0 Thomas Adam

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@


2c8fb90b1e Thomas Adam

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@


94d1a66aaa Thomas Adam

add test coverage for tog displaying a symlink


cbb35faca2 Thomas Adam

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


b993e8cc50 Thomas Adam

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

ok stsp@


0619bbce0e Thomas Adam

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