Commit Briefs


Stefan Sperling

prevent 'got merge' from creating commits on branches outside of "refs/heads/"

ok op, james



Stefan Sperling

make 'got add' more forgiving about unversioned paths on the command line

When users run 'got add *' the shell may pick up already versioned files and trigger errors about paths being in an unexpected status. Expand the check which previously only allowed files in added status to be double-added to cover the following status codes which are all safe to ignore: A M C m This should make bulk additions of files a bit easier in most cases. Problem reported by robert@ ok jamsek



James Cook

Implement fast-forward merges.

Split part of got_worktree_merge_prepare into a new function, got_worktree_merge_write_refs, since that part doesn't make sense in the fast-forward case. ok stsp@



Stefan Sperling

make 'got tree /' succeed in a work tree

Previously, this command would trigger an error: got: /: bad path


Stefan Sperling

update gotd_proc_names after session process unveil changes

fixes "proc (null)" appearing in gotd logs


Omar Polo

gotwebd.conf: unbreak max_repos_display 0

in 1a0c81fb61 I've added a range check too strict for max_repos_display, as zero is allowed and means "show all the repositories".



Omar Polo

add a lock for the cleanup operation

This adds the functions got_repo_cleanup_prepare() and _complete() to lock/unlock the repository to prevent multiple `gotadmin cleanup' or `git gc' operations to run in parallel. improvements and ok stsp@



Omar Polo

retire GOT_ERR_QUERYSTRING

it's redundant with GOT_ERR_BAD_QUERYSTRING; convert its only use to the latter.


Omar Polo

add myself in the AUTHORs section


Stefan Sperling

update cleanup -p documentation





Stefan Sperling

reorder paragraphs in gotadmin.1 cleanup section

All the special cases are now being explained last.




Omar Polo

gotadmin cleanup: remove redundant pack files

improvements and ok stsp@


Omar Polo

regress/cmdline: fix handling of unexpected success

Diff from James Cook, thanks!


Omar Polo

gather_on_disk_refs(): skip over bad refs

noticed since gotwebd fails when there's a ref.lock file due to a concurrent update. discussed with stsp.