Commits
- Commit:
75bbb53178bc07949826c81f52ea9f5f042b43e4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show hint about update -b if the user attempts to rebase a branch onto itself
Specifically, when 'gut send' suggests 'fetch and rebase required', new users
might try to use 'got fetch' directly followed by 'got rebase' without first
updating the work tree to newly fetched commits. Got would then say "main is
already based on main" without any hint for a way out. Hopefully, pointing
users at the update -b command will make them search the manual for details.
- Commit:
78e82c8a2a2cd0fed316492b18264f5d8727f961
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove GOT_ERR_ITER_BUSY from got_commit_graph_iter_start()
Just clear any left-over iteration state and begin a fresh iteration
instead of returning GOT_ERR_ITER_BUSY if the caller did not loop
through the entire graph.
This change currently doesn't matter much since all existing callers
only do a single pass over the graph. But it frees up an error code
and makes this API more flexible.
- Commit:
e0586a74fdd1c8da68d9ecce4078de8b4602df16
- From:
- Ryan Kavanagh <rak@debian.org>
- Via:
- Mark Jamsek <mark@jamsek.dev>
- Date:
typo (s/occured/occurred) fix from Ryan Kavanagh via tobhe@
- 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@
- Commit:
21f077265038a0c30c857035d2ab286f293573b1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
require space between commit author name and email, for Git compatibility
Allowing such author fields breaks 'got send' towards Github for affected
commits because git-index-pack --strict will error out on the server:
$ git index-pack --strict pack-de791fb6a3a1961e44ac5d98d72fd533bf9277c8.pack
error: object 5d6bde9eaaf27f41ae8fa7112bb45e489d3c16b9: missingSpaceBeforeEmail:
invalid author/committer line - missing space before email
fatal: fsck error in packed object
problem encountered by landry@
ok op@
- Commit:
13b2bc374c1870ec27b2eeb40efe68fd465f64bb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
introduce gotd(8), a Git repository server reachable via ssh(1)
This is an initial barebones implementation which provides the absolute
minimum of functionality required to serve got(1) and git(1) clients.
Basic fetch/send functionality has been tested and seems to work here,
but this server is not yet expected to be stable.
More testing is welcome. See the man pages for setup instructions.
The current design uses one reader and one writer process per repository,
which will have to be extended to N readers and N writers in the future.
At startup, each process will chroot(2) into its assigned repository.
This works because gotd(8) can only be started as root, and will then
fork+exec, chroot, and privdrop.
At present the parent process runs with the following pledge(2) promises:
"stdio rpath wpath cpath proc getpw sendfd recvfd fattr flock unix unveil"
The parent is the only process able to modify the repository in a way
that becomes visible to Git clients. The parent uses unveil(2) to
restrict its view of the filesystem to /tmp and the repositories
listed in the configuration file gotd.conf(5).
Per-repository chroot(2) processes use "stdio rpath sendfd recvfd".
The writer defers to the parent for modifying references in the
repository to point at newly uploaded commits. The reader is fine
without such help, because Git repositories can be read without
having to create any lock-files.
gotd(8) requires a dedicated user ID, which should own repositories
on the filesystem, and a separate secondary group, which should not
have filesystem-level repository access, and must be allowed access
to the gotd(8) socket.
To obtain Git repository access, users must be members of this
secondary group, and must have their login shell set to gotsh(1).
gotsh(1) connects to the gotd(8) socket and speaks Git-protocol
towards the client on the other end of the SSH connection.
gotsh(1) is not an interactive command shell.
At present, authenticated clients are granted read/write access to
all repositories and all references (except for the "refs/got/" and
the "refs/remotes/" namespaces, which are already being protected
from modification).
While complicated access control mechanism are not a design goal,
making it possible to safely offer anonymous Git repository access
over ssh(1) is on the road map.
- Commit:
d2533287ff253bfb6fe08ddc0005ac3349fdf38c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove accidentally committed debug assertion
- Commit:
e02b422b6f7736de0e851b3f8fad812e77e9c6b4
- From:
- Josh Rickmar <jrick@zettaport.com>
- Date:
disallow integrating into references outside refs/heads/
Spotted by stsp@ while considering a feature request for
cmd_integrate.
ok stsp@
- Commit:
58381f7013ee220415b44aaf36c549b2f1cd2937
- From:
- Omar Polo <op@omarpolo.com>
- Date:
gotwebd: percent-decode the received query string
ok stsp@
- Commit:
438d0cc30baf8e97fd870f5e620833e0a45401aa
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix snprintf error handling
follow the "proper secure idiom" described in the CAVEATS section of
printf(3). reminded by tb@ and millert@
- Commit:
62b21d332b3a92a7f99022d68bc8fd98a4682d33
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got commit: add flag to specify the author
This adds a new flag, `got commit -A', that allows to specify the commit
author but retains the "committer" (which is obtained as usual via
GOT_AUTHOR, got.conf or git config.)
with lots of help from and ok stsp