upstream: https://github.com/mirage/mirage-crypto
git-x: regroup CLI under tree/commit; add tree add
Previously the eight git-x subcommands sat flat at top level (split,
check, fix, verify, filter-paths, split-commit, drop-commit, reword),
with 'split' ambiguous between the subtree split and the per-directory
commit split.
Regrouped into two namespaces that mirror the object they act on:
git-x tree
split (was: git-x split)
add (new — inject a standalone history under a prefix)
drop (was: git-x filter-paths)
check (was: git-x check)
fix (was: git-x fix)
verify (was: git-x verify)
git-x commit
split (was: git-x split-commit)
drop (was: git-x drop-commit)
reword (was: git-x reword)
Each subcommand lives in cmd_<group>_<verb>.{ml,mli}; cmd_tree.ml and
cmd_commit.ml are the Cmd.group wrappers. git_x.ml registers just the
two groups.
'tree add' is a thin wrapper over Git.Subtree.add, which already
existed in the library but had no CLI exposure. It accepts a ref (e.g.
FETCH_HEAD after 'git fetch URL REF') and a --prefix, then builds a
subtree-merge commit with the current user's git config identity.
Log source names are updated to match (git-x.tree.split,
git-x.tree.fix). The cram test under test/cram/tree_split.t is
updated to use the new 'git-x tree split' invocation throughout.
+118
-104
+23
-33
crypto-ec.opam
+23
-33
crypto-ec.opam
···
1
1
# This file is generated by dune, edit dune-project instead
2
2
opam-version: "2.0"
3
3
synopsis: "Elliptic Curve Cryptography (fork of mirage-crypto-ec)"
4
-
description: """
5
-
WARNING: This is an experimental fork of mirage-crypto-ec. Do not use in production.
6
-
Use mirage-crypto-ec instead: https://github.com/mirage/mirage-crypto
7
-
8
-
An implementation of key exchange (ECDH) and digital signature (ECDSA/EdDSA)
9
-
algorithms using code from Fiat (<https://github.com/mit-plv/fiat-crypto>).
10
-
11
-
The curves P256 (SECP256R1), P384 (SECP384R1),
12
-
P521 (SECP521R1), and 25519 (X25519, Ed25519) are implemented by this package.
13
-
"""
14
-
maintainer: "Thomas Gazagnaire <thomas@gazagnaire.org>"
4
+
description:
5
+
"WARNING: This is an experimental fork of mirage-crypto-ec. Do not use in production. Use mirage-crypto-ec instead: https://github.com/mirage/mirage-crypto. An implementation of key exchange (ECDH) and digital signature (ECDSA/EdDSA) algorithms using code from Fiat. The curves P256, P384, P521, and 25519 (X25519, Ed25519) are implemented."
6
+
maintainer: ["Thomas Gazagnaire <thomas@gazagnaire.org>"]
15
7
authors: [
16
-
"Hannes Mehnert <hannes@mehnert.org>"
17
-
"Nathan Rebours <nathan.p.rebours@gmail.com>"
18
-
"Clément Pascutto <clement@tarides.com>"
19
-
"Etienne Millon <me@emillon.org>"
20
-
"Virgile Robles <virgile.robles@protonmail.ch>"
21
-
# and from the fiat-crypto AUTHORS file
22
-
"Andres Erbsen <andreser@mit.edu>"
23
-
"Google Inc."
24
-
"Jade Philipoom <jadep@mit.edu> <jade.philipoom@gmail.com>"
25
-
"Massachusetts Institute of Technology"
26
-
"Zoe Paraskevopoulou <zoe.paraskevopoulou@gmail.com>"
8
+
"David Kaloper <dk505@cam.ac.uk>" "Hannes Mehnert <hannes@mehnert.org>"
27
9
]
28
-
license: "MIT"
10
+
license: "ISC"
11
+
tags: ["org:blacksun" "org:mirage" "crypto"]
29
12
homepage: "https://tangled.org/gazagnaire.org/ocaml-crypto"
30
13
bug-reports: "https://tangled.org/gazagnaire.org/ocaml-crypto/issues"
31
14
depends: [
32
-
"dune" {>= "2.7"}
15
+
"dune" {>= "3.21" & >= "2.7"}
33
16
"ocaml" {>= "4.13.0"}
34
17
"dune-configurator"
35
18
"eqaf" {>= "0.7"}
36
-
"crypto-rng" {=version}
19
+
"crypto-rng" {= version}
37
20
"digestif" {>= "1.2.0"}
38
21
"alcotest" {with-test & >= "0.8.1"}
39
22
"asn1-combinators" {with-test & >= "0.3.1"}
40
23
"ohex" {with-test & >= "0.2.0"}
41
24
"ounit2" {with-test}
42
-
]
43
-
conflicts: [
44
-
"ocaml-freestanding"
25
+
"odoc" {with-doc}
45
26
]
27
+
conflicts: ["ocaml-freestanding"]
46
28
build: [
47
29
["dune" "subst"] {dev}
48
-
["dune" "build" "-p" name "-j" jobs]
49
-
["dune" "runtest" "-p" name "-j" jobs] {with-test}
30
+
[
31
+
"dune"
32
+
"build"
33
+
"-p"
34
+
name
35
+
"-j"
36
+
jobs
37
+
"@install"
38
+
"@runtest" {with-test}
39
+
"@doc" {with-doc}
40
+
]
50
41
]
51
-
dev-repo: "git+https://tangled.org/gazagnaire.org/ocaml-crypto.git"
52
-
tags: ["org:blacksun" "org:mirage" "crypto"]
53
-
x-maintenance-intent: [ "(latest)" ]
42
+
dev-repo: "git+https://tangled.org/gazagnaire.org/ocaml-crypto"
43
+
x-maintenance-intent: ["(latest)"]
+31
-25
crypto-pk.opam
+31
-25
crypto-pk.opam
···
1
1
# This file is generated by dune, edit dune-project instead
2
2
opam-version: "2.0"
3
-
homepage: "https://tangled.org/gazagnaire.org/ocaml-crypto"
4
-
dev-repo: "git+https://tangled.org/gazagnaire.org/ocaml-crypto.git"
5
-
bug-reports: "https://tangled.org/gazagnaire.org/ocaml-crypto/issues"
6
-
authors: ["David Kaloper <dk505@cam.ac.uk>" "Hannes Mehnert <hannes@mehnert.org>" ]
7
-
maintainer: "Thomas Gazagnaire <thomas@gazagnaire.org>"
8
-
license: "ISC"
9
-
tags: ["org:blacksun" "org:mirage" "crypto"]
10
-
synopsis: "Simple public-key cryptography (fork of mirage-crypto-pk)"
11
-
12
-
build: [ ["dune" "subst"] {dev}
13
-
["dune" "build" "-p" name "-j" jobs ]
14
-
["dune" "runtest" "-p" name "-j" jobs] {with-test} ]
15
-
3
+
synopsis: "Simple public-key cryptography (fork of mirage-crypto-pk)"
4
+
description:
5
+
"WARNING: This is an experimental fork of mirage-crypto-pk. Do not use in production. Use mirage-crypto-pk instead: https://github.com/mirage/mirage-crypto. Crypto-pk provides public-key cryptography (RSA, DSA, DH)."
6
+
maintainer: ["Thomas Gazagnaire <thomas@gazagnaire.org>"]
7
+
authors: [
8
+
"David Kaloper <dk505@cam.ac.uk>" "Hannes Mehnert <hannes@mehnert.org>"
9
+
]
10
+
license: "ISC"
11
+
tags: ["org:blacksun" "org:mirage" "crypto"]
12
+
homepage: "https://tangled.org/gazagnaire.org/ocaml-crypto"
13
+
bug-reports: "https://tangled.org/gazagnaire.org/ocaml-crypto/issues"
16
14
depends: [
17
15
"conf-gmp-powm-sec" {build}
18
16
"ocaml" {>= "4.13.0"}
19
-
"dune" {>= "2.7"}
17
+
"dune" {>= "3.21" & >= "2.7"}
20
18
"ounit2" {with-test}
21
19
"randomconv" {with-test & >= "0.2.0"}
22
20
"ohex" {with-test & >= "0.2.0"}
23
-
"crypto" {=version}
24
-
"crypto-rng" {=version}
21
+
"crypto" {= version}
22
+
"crypto-rng" {= version}
25
23
"digestif" {>= "1.2.0"}
26
24
"zarith" {>= "1.13"}
27
25
"eqaf" {>= "0.8"}
26
+
"odoc" {with-doc}
28
27
]
29
-
conflicts: [
30
-
"ocaml-freestanding"
28
+
conflicts: ["ocaml-freestanding"]
29
+
build: [
30
+
["dune" "subst"] {dev}
31
+
[
32
+
"dune"
33
+
"build"
34
+
"-p"
35
+
name
36
+
"-j"
37
+
jobs
38
+
"@install"
39
+
"@runtest" {with-test}
40
+
"@doc" {with-doc}
41
+
]
31
42
]
32
-
description: """
33
-
WARNING: This is an experimental fork of mirage-crypto-pk. Do not use in production.
34
-
Use mirage-crypto-pk instead: https://github.com/mirage/mirage-crypto
35
-
36
-
Crypto-pk provides public-key cryptography (RSA, DSA, DH).
37
-
"""
38
-
x-maintenance-intent: [ "(latest)" ]
43
+
dev-repo: "git+https://tangled.org/gazagnaire.org/ocaml-crypto"
44
+
x-maintenance-intent: ["(latest)"]
+33
-25
crypto-rng.opam
+33
-25
crypto-rng.opam
···
1
1
# This file is generated by dune, edit dune-project instead
2
2
opam-version: "2.0"
3
-
homepage: "https://tangled.org/gazagnaire.org/ocaml-crypto"
4
-
dev-repo: "git+https://tangled.org/gazagnaire.org/ocaml-crypto.git"
5
-
bug-reports: "https://tangled.org/gazagnaire.org/ocaml-crypto/issues"
6
-
authors: ["David Kaloper <dk505@cam.ac.uk>" "Hannes Mehnert <hannes@mehnert.org>" ]
7
-
maintainer: "Thomas Gazagnaire <thomas@gazagnaire.org>"
8
-
license: "ISC"
9
-
tags: ["org:blacksun" "org:mirage" "crypto"]
10
-
synopsis: "A cryptographically secure PRNG (fork of mirage-crypto-rng)"
11
-
12
-
build: [ ["dune" "subst"] {dev}
13
-
["dune" "build" "-p" name "-j" jobs ]
14
-
["dune" "runtest" "-p" name "-j" jobs] {with-test} ]
15
-
3
+
synopsis: "A cryptographically secure PRNG (fork of mirage-crypto-rng)"
4
+
description:
5
+
"WARNING: This is an experimental fork of mirage-crypto-rng. Do not use in production. Use mirage-crypto-rng instead: https://github.com/mirage/mirage-crypto. Crypto-rng provides a random number generator interface, and implementations: Fortuna, HMAC-DRBG, getrandom/getentropy based (in the unix sublibrary)."
6
+
maintainer: ["Thomas Gazagnaire <thomas@gazagnaire.org>"]
7
+
authors: [
8
+
"David Kaloper <dk505@cam.ac.uk>" "Hannes Mehnert <hannes@mehnert.org>"
9
+
]
10
+
license: "ISC"
11
+
tags: ["org:blacksun" "org:mirage" "crypto"]
12
+
homepage: "https://tangled.org/gazagnaire.org/ocaml-crypto"
13
+
bug-reports: "https://tangled.org/gazagnaire.org/ocaml-crypto/issues"
16
14
depends: [
17
15
"ocaml" {>= "4.14.0"}
18
-
"dune" {>= "2.7"}
16
+
"dune" {>= "3.21" & >= "2.7"}
19
17
"dune-configurator" {>= "2.0.0"}
20
18
"logs"
21
-
"crypto" {=version}
19
+
"crypto" {= version}
22
20
"digestif" {>= "1.1.4"}
23
21
"ounit2" {with-test}
24
22
"randomconv" {with-test & >= "0.2.0"}
25
23
"ohex" {with-test & >= "0.2.0"}
24
+
"odoc" {with-doc}
26
25
]
27
-
conflicts: [ "mirage-runtime" {< "3.8.0"} ]
28
-
description: """
29
-
WARNING: This is an experimental fork of mirage-crypto-rng. Do not use in production.
30
-
Use mirage-crypto-rng instead: https://github.com/mirage/mirage-crypto
31
-
32
-
Crypto-rng provides a random number generator interface, and
33
-
implementations: Fortuna, HMAC-DRBG, getrandom/getentropy based (in the unix
34
-
sublibrary)
35
-
"""
36
-
x-maintenance-intent: [ "(latest)" ]
26
+
conflicts: [
27
+
"mirage-runtime" {< "3.8.0"}
28
+
]
29
+
build: [
30
+
["dune" "subst"] {dev}
31
+
[
32
+
"dune"
33
+
"build"
34
+
"-p"
35
+
name
36
+
"-j"
37
+
jobs
38
+
"@install"
39
+
"@runtest" {with-test}
40
+
"@doc" {with-doc}
41
+
]
42
+
]
43
+
dev-repo: "git+https://tangled.org/gazagnaire.org/ocaml-crypto"
44
+
x-maintenance-intent: ["(latest)"]
+31
-21
crypto.opam
+31
-21
crypto.opam
···
1
1
# This file is generated by dune, edit dune-project instead
2
2
opam-version: "2.0"
3
-
homepage: "https://tangled.org/gazagnaire.org/ocaml-crypto"
4
-
dev-repo: "git+https://tangled.org/gazagnaire.org/ocaml-crypto.git"
5
-
bug-reports: "https://tangled.org/gazagnaire.org/ocaml-crypto/issues"
6
-
authors: ["David Kaloper <dk505@cam.ac.uk>" "Hannes Mehnert <hannes@mehnert.org>" ]
7
-
maintainer: "Thomas Gazagnaire <thomas@gazagnaire.org>"
8
-
license: "ISC"
9
-
tags: ["org:blacksun" "org:mirage" "crypto"]
10
-
synopsis: "Simple symmetric cryptography (fork of mirage-crypto)"
11
-
12
-
build: [ ["dune" "subst"] {dev}
13
-
["dune" "build" "-p" name "-j" jobs ]
14
-
["dune" "runtest" "-p" name "-j" jobs] {with-test} ]
15
-
3
+
synopsis: "Simple symmetric cryptography (fork of mirage-crypto)"
4
+
description:
5
+
"WARNING: This is an experimental fork of mirage-crypto. Do not use in production. Use mirage-crypto instead: https://github.com/mirage/mirage-crypto. Crypto provides symmetric ciphers (DES, AES, RC4, ChaCha20/Poly1305)."
6
+
maintainer: ["Thomas Gazagnaire <thomas@gazagnaire.org>"]
7
+
authors: [
8
+
"David Kaloper <dk505@cam.ac.uk>" "Hannes Mehnert <hannes@mehnert.org>"
9
+
]
10
+
license: "ISC"
11
+
tags: ["org:blacksun" "org:mirage" "crypto"]
12
+
homepage: "https://tangled.org/gazagnaire.org/ocaml-crypto"
13
+
bug-reports: "https://tangled.org/gazagnaire.org/ocaml-crypto/issues"
16
14
depends: [
17
15
"ocaml" {>= "4.13.0"}
18
-
"dune" {>= "2.7"}
16
+
"dune" {>= "3.21" & >= "2.7"}
19
17
"dune-configurator" {>= "2.0.0"}
20
18
"fmt"
21
19
"ounit2" {with-test}
22
20
"ohex" {with-test & >= "0.2.0"}
23
21
"eqaf" {>= "0.8"}
22
+
"odoc" {with-doc}
24
23
]
25
24
conflicts: [
26
25
"ocaml-freestanding"
27
26
"result" {< "1.5"}
28
27
]
29
-
description: """
30
-
WARNING: This is an experimental fork of mirage-crypto. Do not use in production.
31
-
Use mirage-crypto instead: https://github.com/mirage/mirage-crypto
32
-
33
-
Crypto provides symmetric ciphers (DES, AES, RC4, ChaCha20/Poly1305).
34
-
"""
35
-
x-maintenance-intent: [ "(latest)" ]
28
+
build: [
29
+
["dune" "subst"] {dev}
30
+
[
31
+
"dune"
32
+
"build"
33
+
"-p"
34
+
name
35
+
"-j"
36
+
jobs
37
+
"@install"
38
+
"@runtest" {with-test}
39
+
"@doc" {with-doc}
40
+
]
41
+
]
42
+
dev-repo: "git+https://tangled.org/gazagnaire.org/ocaml-crypto"
43
+
x-maintenance-intent: ["(latest)"]
44
+
x-quality-fuzz: "2026-04-15"
45
+
x-quality-test: "2026-04-15"