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:
fd7552d245966f4a57fdc5ec287c3226d5145391
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
implement support for keywords as got <commit> arguments
This begins enabling the use of keywords in got wherever commit ids or
references are used, with more work intended to expand support across all
such instances (e.g., branch, checkout, etc.), and add more keywords.
The keywords ":base" and ":head" can be passed to 'got {diff,log,update} -c'
commands as a substitute for the corresponding commit hash id. Keywords and
references can also be modified by appending a ':+' or ':-' and an optional
integer N to specify by first parent traversal the Nth generation descendant
or antecedent, respectively. If N is omitted, a '1' is implicitly appended.
tweaks + ok op and stsp
- Commit:
f7d653fcfcca0cce30313948d6e58d074502c599
- From:
- Omar Polo <op@omarpolo.com>
- Date:
add an initial implementation of gotadmin load
it is intended to be the counterpart of `gotadmin dump' and, just
like it, there's planned support for handling fast-import stream.
At the moment it only deals with git bundles.
ok stsp
- Commit:
f25e229e88a01c4a65fa80f4d5e35cd34309cbf9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
de2b82f3b95e95070d83077e7bb0f24f82ae7426
- From:
- Omar Polo <op@omarpolo.com>
- Date:
retire GOT_ERR_QUERYSTRING
it's redundant with GOT_ERR_BAD_QUERYSTRING; convert its only use
to the latter.
- Commit:
6b5246e4d4f6c6cbd079a43d14042d998fbc902f
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got merge -c' fail even if new changes only affect unrelated paths
Otherwise, 'got merge -c' can silently revert already committed changes.
Also fix GOT_ERR_MERGE_COMMIT_OUT_OF_DATE by giving it a value distinct
from GOT_ERR_MERGE_STAGED_PATHS.
Patch by James Cook
- Commit:
2f43cd698e3fcc3000262b3e0f3a2119f06345bb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove dependency of gitwrapper, gotctl, and gotsh on object_parse.c
Move some functions from object_parse.c into hash.c. These functions either
require hash.c code anyway or contain object ID implementation internals.
Add a new file object_qid.c, for got_object_id_queue and got_object_qid.
This new file must be linked to virtually every program.
- Commit:
9afa3de221045d529287cc3fa75fdc2915aed5c1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for protecting references against 'got send -f' to gotd
ok op@
- Commit:
6c5befc77a38fbe198b99fe0564052ffc0f246a6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
require gotsh to exist if the repository is listed in gotd.conf
ok op@
- Commit:
5822e79e39a8777984e08b5d89a8c55d6aa0356d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
include sha2.h too where sha1.h is included
In preparation for wide sha256 support; stsp@ agrees. Change done
mechanically with
find . -iname \*.[cy] -exec sam {} +
X ,x/<sha1\.h>/i/\n#include <sha2.h>
- Commit:
a4515c6608c1b685bfa9187b2517b44773a11068
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: drop commit -A $GOT_AUTHOR restriction
As discussed with op and stsp on irc, this prevents the valid case of
changing a commit's author to yourself during a histedit operation, and
potentially blocks other valid use cases too.
ok stsp@ and op@
- Commit:
3c23f6cdb61cc63d6fd9ecbcc015cd1347793eb1
- From:
- Omar Polo <op@omarpolo.com>
- Date:
introduce got_error_checksum
ok stsp@
- Commit:
bbc740ac4905ed0d4ba6334f6225c8f8c9f3c394
- From:
- Omar Polo <op@omarpolo.com>
- Date:
introduce got_object_id_hex to replace some got_sha1_digest_to_str()
It's an analogous to got_object_id_str but writes to the given buffer.
ok + improvements by stsp@
- Commit:
980c6786a419950816c67eb1b53e021ebdfe483c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got rebase' work when the to-be-rebased branch has no parent commit
found by and ok op@, who also provided the test case
- Commit:
365cf0f34d08316d433e730a8663283029f729b3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move "unix" pledge promise from gotd parent to auth process
The listen process now communicates the client UID/GID to the parent,
and the auth process verifies this on behalf of the parent.
This allows us to remove the "unix" pledge promise from the parent,
removing parent access to syscalls such as listen() and accept() in
the AF_UNIX domain.
ok tracey@ op@