commit bd0bf38778e2381d5951ab5d7f7411ff62d93e4b from: Stefan Sperling date: Tue Apr 23 11:32:27 2024 UTC sync man pages commit - 7b15f394cc48dec0639dc34a1cf939a4f20f08d3 commit + bd0bf38778e2381d5951ab5d7f7411ff62d93e4b blob - 2ebd0dec63ec9e12b29d2b40f7087f38a3de22cc blob + 748836b22229c138b54386f342915d2fbbf72a9c --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@
March 11, + line">April 23, 2024 OpenBSD 7.5
blob - d65d0897c40fd6083dd62bfe743e91c90dbfefdb blob + 82452f07891253bdba9953ee86ec1838003d2cdb --- gitwrapper.1.html +++ gitwrapper.1.html @@ -142,7 +142,7 @@
March 11, + line">April 23, 2024 OpenBSD 7.5
blob - 5f0f68adc6185e16646fb059b732111ff68d0c6a blob + 9f112b2eef1ea7fb9612b912eb4072238b3c3435 --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@
March 11, + line">April 23, 2024 OpenBSD 7.5
blob - 62a7177d76f13697ccc47eba343683c7f051d3c5 blob + 1f30ef1e080b44cab9ef78f963a4c616df9a6f75 --- got.1.html +++ got.1.html @@ -149,14 +149,28 @@ git-daemon(1) server. Use of this protocol is discouraged since it supports neither authentication nor encryption. -
git+ssh
+
ssh
The Git protocol wrapped in an authenticated and encrypted ssh(1) tunnel. With this protocol the hostname may contain an embedded username for ssh(1) to use: user@hostname
-
ssh
-
Short alias for git+ssh.
+
http
+
The “smart” Git HTTP protocol. Not compatible with + servers using the “dumb” Git HTTP protocol. +

The “smart” Git HTTP protocol is supported + by got clone and got + fetch, but not by got send. Sending + from a repository cloned over HTTP will require use of the + send directive in + got.conf(5) to + ensure that the “ssh://” protocol will be used by + got send.

+

Use of this protocol is discouraged since it supports + neither authentication nor encryption.

+
+
https
+
The “smart” Git HTTP protocol wrapped in SSL/TLS.

Objects in the cloned repository are stored in a pack file which is downloaded from the server. This pack file will then be indexed @@ -672,6 +686,10 @@ file was modified after having been staged for addition +

If the work tree contains the results of an interrupted + got rebase, got + histedit, or got merge operation then + display a message which shows the branches involved.

The options for got status are as follows:

@@ -716,7 +734,7 @@ “/”, in a pattern.

- [-bdPpRs] [-C + [-bdPpRst] [-C number] [-c commit] [-l N] [-r @@ -834,6 +852,12 @@
Display a short one-line summary of each commit, instead of the default history format. Cannot be used together with the -p or -P option.
+
+
Display commits in topological order. This option has no effect + without the -b option because a linear history + is sorted in topological order by definition. Topological sorting is + disabled by default because the present implementation requires that + commit history is fully traversed before any output can be shown.
commit
Stop traversing commit history immediately after the specified @@ -1127,7 +1151,7 @@ loops between references when this option is used. Cannot be used together with any other options except -r.
-
+
Sort listed references by modification time (most recently modified first) instead of sorting by lexicographical order. Use of this option requires the -l option to be used as @@ -1259,7 +1283,7 @@ repository is located at or above the current working directory. If this directory is a got work tree, use the repository path associated with this work tree.
-
+
Sort listed branches by modification time (most recently modified first) instead of sorting by lexicographical order. Branches in the “refs/heads/” reference namespace are listed before @@ -1845,7 +1869,7 @@ -T option is equivalent to listing all tags with multiple -t options. Cannot be used together with the -t option.
-
+
tag
Send the specified tag from the local repository's “refs/tags/” reference namespace, in @@ -2698,7 +2722,7 @@
- [-lpS] [-F + [-lpRS] [-F response-script] [path ...]
(alias: @@ -2762,6 +2786,10 @@ individual patches derived from the modified file content can be staged. Files in added or deleted status may only be staged or rejected in their entirety.
+
+
Permit recursion into directories. If this option is not specified, + got stage will refuse to run if a specified + path is a directory.
Allow staging of symbolic links which point outside of the path space that is under version control. By default, got @@ -2790,7 +2818,7 @@ necessary.

- [-p] [-F + [-pR] [-F response-script] [path ...]
(alias: @@ -2844,6 +2872,10 @@ If a file is staged in modified status, individual patches derived from the staged file content can be unstaged. Files staged in added or deleted status may only be unstaged in their entirety.
+
+
Permit recursion into directories. If this option is not specified, + got unstage will refuse to run if a specified + path is a directory.
@@ -3009,11 +3041,10 @@ anonymous access via SSH. Such sites will require an account to be created, and a public SSH key to be uploaded to this account, before repository access via ssh:// URLs will work.

-

Use of HTTP URLs currently requires git(1):

+

Most sites offer anonymous repository access via HTTPS:

$ cd /var/git/
-
$ git clone --bare +
$ got clone https://github.com/openbsd/src.git

Alternatively, for quick and dirty local testing of got a new Git repository could be created and @@ -3134,13 +3165,6 @@

$ cd /usr/src
$ got fetch
-

In a repository created with a HTTP URL and git - clone --bare the git-fetch(1) command must be used instead:

-

-
$ cd /var/git/src.git
-
$ git fetch origin - master:refs/remotes/origin/master

Rebase the local “master” branch to merge the new changes that are now visible on the “origin/master” branch:

@@ -3472,9 +3496,6 @@ remote "origin" { git(1) to perform some tasks. In particular:

    -
  • Reading from remote repositories over HTTP or HTTPS protocols requires - git-clone(1) and - git-fetch(1).
  • Writing to remote repositories over HTTP or HTTPS protocols requires git-push(1).
  • The creation of merge commits with more than two parent commits requires @@ -3487,7 +3508,7 @@ remote "origin" {
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - abf21812acf06903ae98b7f6185dfbb5fd5faea0 blob + 1917a233a6eb9eee6d95a52e39bfc9f9c1e693e3 --- got.conf.5.html +++ got.conf.5.html @@ -306,7 +306,7 @@
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - 64a934e2426369f0c2dc3b0cbfee24f5e2971252 blob + 3908702f5fa21b3db0aaa5e2411ce87751245062 --- gotadmin.1.html +++ gotadmin.1.html @@ -424,7 +424,7 @@
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - 8a107c269f9a4f65962e971554b2f6a60c16a1c5 blob + dd544668c4959201fb0376ff2340a043b005e0d9 --- gotctl.8.html +++ gotctl.8.html @@ -86,7 +86,7 @@
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - 15a37fbb779dce66cf83bc7ee8e8d84da6ca74a5 blob + 934c1d4fe17f4b57a6e53a0d6b195b06cb45a367 --- gotd.8.html +++ gotd.8.html @@ -99,7 +99,7 @@
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - 30a53bb588f951cd2c2246bc9e49a9861e713af3 blob + 10d040b23b01c6dd5e2dbd9b635a4689c9b3f97a --- gotd.conf.5.html +++ gotd.conf.5.html @@ -202,6 +202,206 @@ gotd.conf. These namespaces are always protected and even attempts to create new references in these namespaces will always be denied.

    + +
    + {...}
    +
    The notify directive enables notifications about + new commits or tags added to the repository. +

    Notifications via email require an SMTP daemon which accepts + mail for forwarding without requiring client authentication or + encryption. On OpenBSD the + smtpd(8) daemon can be + used for this purpose. The default content of email notifications looks + similar to the output of the got log -d + command.

    +

    Notifications via HTTP require a HTTP or HTTPS server which is + accepting POST requests with or without HTTP Basic authentication. + Depending on the use case a custom server-side CGI script may be + required for the processing of notifications. HTTP notifications can + achieve functionality similar to Git's server-side post-receive hook + script with gotd(8) by + triggering arbitrary post-commit actions via the HTTP server.

    +

    The notify directive expects + parameters which must be enclosed in curly braces. The available + parameters are as follows:

    +
    +
    + name
    +
    Send notifications about commits to the named branch. The + name will be looked up in the + “refs/heads/” reference namespace. This directive may be + specified multiple times to build a list of branches to send + notifications for. If neither a branch nor a + reference namespace are specified then changes + to any reference will trigger notifications.
    +
    + namespace namespace
    +
    Send notifications about commits or tags within a reference namespace. + This directive may be specified multiple times to build a list of + namespaces to send notifications for. If neither a + branch nor a reference + namespace are specified then changes to any reference will + trigger notifications.
    +
    + [from sender] + to recipient + [reply to responder] + [relay hostname + [port port]]
    +
    Send notifications via email to the specified + recipient. This directive may be specified + multiple times to build a list of recipients to send notifications to. +

    The recipient must be an email + addresses that accepts mail. The sender will + be used as the From address. If not specified, the sender defaults + to an email address composed of the user account running + gotd(8) and the local + hostname.

    +

    If a responder is specified via the + reply to directive, the + responder will be used as the Reply-to + address. Setting the Reply-to header can be useful if replies should + go to a mailing list instead of the sender, + for example.

    +

    By default, mail will be sent to the SMTP server listening + on the loopback address 127.0.0.1 on port 25. The + relay and port + directives can be used to specify a different SMTP server address + and port.

    +
    +
    + URL [user + user password + password [insecure]]
    +
    Send notifications via HTTP. This directive may be specified multiple + times to build a list of HTTP servers to send notifications to. +

    The notification will be sent as a POST request to the + given URL, which must be a valid HTTP URL and + begin with either “http://” or + “https://”. If HTTPS is used, sending of notifications + will only succeed if no TLS errors occur.

    +

    The optional user and + password directives enable HTTP Basic + authentication. If used, both a user and a + password must be specified. The + password must not be an empty string. Unless + the insecure option is specified the + notification target URL must be a + “https://” URL to avoid leaking of authentication + credentials.

    +

    The request body contains a JSON object with a + “notifications” property containing an array of + notification objects. Each notification object has a + ‘type’ property. Depending on the type, each + notification object has different fields. The types are:

    +
    +
    +
    The commit notification object has the following fields. Except + where noted, all are optional. +
    +
    +
    Boolean, indicates whether the object has all the fields set. + When several commits are batched in a single send operation, + not all of the fields are available for each commit + object.
    +
    +
    The repository name as string.
    +
    +
    The commit ID as string, may be abbreviated.
    +
    +
    An object with the committer information with the following + fields: +

    +
    +
    +
    Committer's full name.
    +
    +
    Committer's name.
    +
    +
    Committer's mail address.
    +
    +
    Committer's username. This is the only field guaranteed to + be set.
    +
    +
    +
    +
    An object with the author information. Has the same fields as + the committer but may be unset.
    +
    +
    Number, representing the number of seconds since the Epoch in + UTC.
    +
    +
    The first line of the commit message. This field is always + set.
    +
    +
    The complete commit message, may be unset.
    +
    +
    An object with the summarized changes, may be unset. Contains + a files field with an array of objects + describing the changes per-file and a + total field with the cumulative + changes. The changes per-file contains the following fields: +

    +
    +
    +
    A string describing the action, can be + “added”, “deleted”, + “modified”, “mode changed”, or + “unknown”.
    +
    +
    The file path.
    +
    +
    The number of lines added.
    +
    +
    The number of lines removed.
    +
    +

    The total object contains + two fields: added and + removed which are the number of + added and removed lines respectively.

    +
    +
    +
    +
    +
    The branch deleted notifications has the following fields, all + guaranteed to be set: +
    +
    +
    The repository name as string.
    +
    +
    The removed branch reference.
    +
    +
    The hash of the commit pointed by the deleted branch.
    +
    +
    +
    +
    The tag notification has the following fields, all guaranteed to + be set: +
    +
    repo
    +
    The repository name as string.
    +
    tag
    +
    The tag reference.
    +
    tagger
    +
    The user information, with the same format of the + committer field for the + commit notification but with all the + field guaranteed to be set.
    +
    +
    Number, representing the number of seconds since the Epoch in + UTC.
    +
    +
    The object being tagged. It contains the fields + type with the object type and + id with the object id being + tagged.
    +
    +
    The tag message.
    +
    +
    +
    +
    +
    @@ -244,6 +444,12 @@ repository "openbsd/ports" { branch "main" tag namespace "refs/tags/" } + + notify { + branch "main" + reference namespace "refs/tags/" + email to openbsd-ports-changes@example.com + } } # Use a larger request timeout value: @@ -265,7 +471,7 @@ connection {
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - f1e41cdc74344c846a6d0a6b02b9d9532b31c2a9 blob + 2f8b5bbb49b15a58dc48a06aeea02fd1de696423 --- gotsh.1.html +++ gotsh.1.html @@ -157,7 +157,7 @@
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - b0faf87c34851d6335d9fc6110602f19f1728f46 blob + 1b034f69fee6aabb1422cfab705d85302fdfd278 --- gotwebd.8.html +++ gotwebd.8.html @@ -188,7 +188,7 @@ server "example.com" {
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - 07e53fc18864a040aa443da5482b6d54c776b47a blob + bf258f30500ae7840e0c6f063860270ffda2ef16 --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -236,7 +236,7 @@ owner = "Your Name"
    March 11, + line">April 23, 2024 OpenBSD 7.5
    blob - 7dff074ebdfcd979b5a081a73942024e37f8adab blob + 91892d4bca9fd1e8c531c15615c5dddbea0b5a34 --- tog.1.html +++ tog.1.html @@ -847,7 +847,7 @@
    March 11, + line">April 23, 2024 OpenBSD 7.5