Commits


use a separate .cvg meta data directory for cvg(1) work trees This prevents mixing the use of got and cvg clients in the same work tree. Avoids confusion going forward while cvg differentiates itself further. tog(1) and gotadmin(1) remain compatible with both work tree formats. These tools only read work trees to locate the corresponding repository.


Begin cvg


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@


using a local packfd variable in open_worktree() is sufficient


move got_opentempfd out of got_repo_open. ok stsp@ thanks for all the help massaging this diff


add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey


add fd field to got_worktree, modify got_fileindex_entry_update to use fds These changes are intended to make got more compatible with FreeBSD's Capsicum. ok stsp


add per-worktree got.conf(5) file in the .got directory; ok millert


fix out-of-date check regression; only commit staged files after 'got stage'


rename "histedit list" to "histedit script" (on-disk filename changed)


initial 'got histedit' implementation


initial 'got rebase' implementation


use absolute path for reference in got/worktree namespace


make struct got_commitable opaque to library users


stop caching head ref's value in struct got_worktree; may become stale


move worktree base refs into a subdirectory


deduplicate code for constructing a worktree's base ref name


create references to base commits of got worktrees


read UUID back from work tree meta data


add a UUID to work tree meta data


store parsed head reference in struct got_worktree


store a parsed base commit ID in struct got_worktree


fix naming of some work tree meta data files and macros


make got_worktree_checkout_files() infer base commit from meta data


store base commit in a dedicated meta file