Commits
- Commit:
df6221c7df42758252c508006201c3f66e6ae831
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
3d1b16d126400e28a2cbab66b17dacd47a01763c
- From:
- Josh Rickmar <jrick@zettaport.com>
- Date:
Begin cvg
- Commit:
5662d61df841f27dd548625738d05c59ee54c2a4
- From:
- Josh Rickmar <jrick@zettaport.com>
- Date:
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@
- Commit:
5a950d099a15fa3dc29590f3a8e90de9d6e1972b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
using a local packfd variable in open_worktree() is sufficient
- Commit:
0ae84acc1f0a0584e4f26ccbe029c895043b3abe
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move got_opentempfd out of got_repo_open. ok stsp@
thanks for all the help massaging this diff
- Commit:
f259c4c18277237ced1043033cb1af739f73db28
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
437adc9d5be73b4b89441362ec89de754374a5a6
- From:
- Yang Zhong <yzhong@freebsdfoundation.org>
- Date:
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
- Commit:
50b0790ed9a28fced631f31e5b7ca76a9a610ea5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add per-worktree got.conf(5) file in the .got directory; ok millert
- Commit:
f0b75401029052c2613a1e5dc3882976b2ab4da9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix out-of-date check regression; only commit staged files after 'got stage'
- Commit:
c3022ba5fc09b6badac00b8c123aad9d45c2e039
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rename "histedit list" to "histedit script" (on-disk filename changed)
- Commit:
0ebf8283cd162a594e725ca2a1fd9f16e6ece6e4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initial 'got histedit' implementation
- Commit:
818c750100809b9b2d2c638d39f1427a66929fce
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initial 'got rebase' implementation
- Commit:
1ab61ced3b985960fcf0256e1720fb712311aeb7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use absolute path for reference in got/worktree namespace
- Commit:
8656d6c4d5273b7a838b8d2b0b057891e50a2ece
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make struct got_commitable opaque to library users
- Commit:
36a387004fc6fb4f302443e39bdffc01d1c1ed47
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
stop caching head ref's value in struct got_worktree; may become stale
- Commit:
7bcb2ecfc09de529ad7b240ac847222205ea9a4a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move worktree base refs into a subdirectory
- Commit:
517bab732f80f5ecc6af2ffcfe6fe1e363303c01
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
deduplicate code for constructing a worktree's base ref name
- Commit:
0cd1c46a9e4b3e3a7c7f2947c3eded6fb5439516
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
create references to base commits of got worktrees
- Commit:
c442a90d575144387b9e5e1c769ba935013bbc71
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
read UUID back from work tree meta data
- Commit:
ec22038e8d0a46e692c6093e0a35503f4af398d7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a UUID to work tree meta data
- Commit:
271d2a38b1a788e9bbd0865e35ee14dce08b5197
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
store parsed head reference in struct got_worktree
- Commit:
eaccb85f7218ef3615353170a2a64ec1c48028e2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
store a parsed base commit ID in struct got_worktree
- Commit:
0f92850ea290f1ce78faa0f9ba874abec8477dea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix naming of some work tree meta data files and macros
- Commit:
93a3027739b17cdd9bccd7bda53f581b919b87ea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got_worktree_checkout_files() infer base commit from meta data
- Commit:
65596e15914f3e70494e33e84a842d7ce360c1e7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
store base commit in a dedicated meta file