diff --git a/deps/checksums/libgit2 b/deps/checksums/libgit2 index 0a8d2a39ffc86..c1906c995cc73 100644 --- a/deps/checksums/libgit2 +++ b/deps/checksums/libgit2 @@ -1,36 +1,38 @@ -LibGit2.v1.8.4+0.aarch64-apple-darwin.tar.gz/md5/a2bca9483d0468b6836304068a8f8d99 -LibGit2.v1.8.4+0.aarch64-apple-darwin.tar.gz/sha512/bbc150e8c330f3cd666136334e15cfbd1017174193b3ece49b1c701aebd2774ef1b23e5e59ec8b05f23788db2ed8a3f103d7ff0fac364966eb5b5b2d814ffd22 -LibGit2.v1.8.4+0.aarch64-linux-gnu.tar.gz/md5/55f133dbf3a1e5ad37c69df3ea6b2274 -LibGit2.v1.8.4+0.aarch64-linux-gnu.tar.gz/sha512/c6f5a25f9b47be391f438867f076ed5b2539ddbb6542119b8225d52c7767705cda499940007b1f33801288426408a2d5ca3feb743e898b747fe0051df5ca7ad4 -LibGit2.v1.8.4+0.aarch64-linux-musl.tar.gz/md5/660b58d4e23b5f142731ccfcffff7b39 -LibGit2.v1.8.4+0.aarch64-linux-musl.tar.gz/sha512/e5d3add19efbbb59c7b79298b83d6342f70b2ad9415ead9460d9e78e117f2a98417a96f49ebfec62e2c18cf9519114e829c2d492e08c45b501aa25552ed97722 -LibGit2.v1.8.4+0.aarch64-unknown-freebsd.tar.gz/md5/67797f9177f007617b2e027673277453 -LibGit2.v1.8.4+0.aarch64-unknown-freebsd.tar.gz/sha512/1dff62cf24e842d978638ca0df9d67e0ed11250b6cb432880aad4603f292c456fcca10b6af304ed19954c22d24bcd8d3fe32e48c45bc2ea348d58eaa0ba6a1ad -LibGit2.v1.8.4+0.armv6l-linux-gnueabihf.tar.gz/md5/cc3264f393d133f9d34d796a1ddccac2 -LibGit2.v1.8.4+0.armv6l-linux-gnueabihf.tar.gz/sha512/8479dda021511747c6ef432eb9a092a54b2fe402e9010b5500faf01be3f2c4f6121fbb45849d6ba5e6a0f57318d6065956c58a5b5ea849e38b056d011ea0588d -LibGit2.v1.8.4+0.armv6l-linux-musleabihf.tar.gz/md5/4427150daaa544d04c0fa59b1b326831 -LibGit2.v1.8.4+0.armv6l-linux-musleabihf.tar.gz/sha512/b2a3cfd08022d012bb27e17bc4d67a0a1c09561420043a96111d029e582be0fdc619fe5227532ab7a902a5d43b5ef4ba1048d2c437c5bc9ac347d80535b60d9a -LibGit2.v1.8.4+0.armv7l-linux-gnueabihf.tar.gz/md5/f8afd5a5b5702dd0015829753244d223 -LibGit2.v1.8.4+0.armv7l-linux-gnueabihf.tar.gz/sha512/986f45f15b66109f372b41a2af2a6c4a7e03edb11ec4ad1cefba0c4cf16a6ddf3b490ba7d60e92a1f2eae91bc550f8d792f1ce66df64e0e2b3c66fbb6ff94cf7 -LibGit2.v1.8.4+0.armv7l-linux-musleabihf.tar.gz/md5/02534a7e25196d3cd504a6ef2993d051 -LibGit2.v1.8.4+0.armv7l-linux-musleabihf.tar.gz/sha512/31ba2fa0c71da0812fdadcf056bfd235379dc4d6960624a9b487bfcef2dd3b0ef3a618e7ed72850fd9e401cae0a143158c0ac48f6526c4845d80d2397eb08fb8 -LibGit2.v1.8.4+0.i686-linux-gnu.tar.gz/md5/0e73f9c928a69a552539f6aab5d44b0c -LibGit2.v1.8.4+0.i686-linux-gnu.tar.gz/sha512/6cca444bcfdef691cbd8ea249328a9f066a20ff23ac71f238a62d32bf40d236d4b4f6cb6d48862652b97791bd199bbf7f8851361ec2778c779a59168b0e08c01 -LibGit2.v1.8.4+0.i686-linux-musl.tar.gz/md5/a6cdca1ca0926ceb5827205005e80759 -LibGit2.v1.8.4+0.i686-linux-musl.tar.gz/sha512/37a456b7a31ca9a482976d3a7aab463dedaebf48aba1d16be5aceae2dbd9051679a0287776a93eabed70f6e9bb89ed4084564a88ed83e1d6a085ec6e32111be5 -LibGit2.v1.8.4+0.i686-w64-mingw32.tar.gz/md5/5ffb5489354195b163c55a6a83d059f0 -LibGit2.v1.8.4+0.i686-w64-mingw32.tar.gz/sha512/81423290e6122210102166b5878e6a101fde2dcdd16de2dea016a682d8aeb13a9db04230d0b6358bec3a8fb8db543b89c3b720c5cdf3418471e41db74bdff993 -LibGit2.v1.8.4+0.powerpc64le-linux-gnu.tar.gz/md5/d99482bb86f1347c83c2795ec10ed551 -LibGit2.v1.8.4+0.powerpc64le-linux-gnu.tar.gz/sha512/a52b1141c1562f7ff55e29e41f95791645f4cca437a8ae09842239a2c132b3b4479edf24abb907d4674b04ceffdc0003dd5d8314697a96b73580ae0cebb59ac1 -LibGit2.v1.8.4+0.x86_64-apple-darwin.tar.gz/md5/f385317d44621ba48d296ffe39d74250 -LibGit2.v1.8.4+0.x86_64-apple-darwin.tar.gz/sha512/25d6fd31a4207d0890b93aa30f98c430d349cfa3c4759e3a81254c39ec095162c916a6fdc6d91ca4b3df3892ac8836209d0927c3ca18b4dfbe5b067f5d79cae9 -LibGit2.v1.8.4+0.x86_64-linux-gnu.tar.gz/md5/9f881bf0428bfbeed1fce06fce156a3c -LibGit2.v1.8.4+0.x86_64-linux-gnu.tar.gz/sha512/ea6e90997ae1dd77cdf73b65995682d3b2563e40215b7316f2cc17982f8a35ac8f40d194d8d25c1a7334cb8443ec028516d05e64b841559b0c5dc15ce289e238 -LibGit2.v1.8.4+0.x86_64-linux-musl.tar.gz/md5/349b44527421615d99c08dca5299bbb6 -LibGit2.v1.8.4+0.x86_64-linux-musl.tar.gz/sha512/809c53ba91a3643ed534c49b1e3352ef8e6cf642dbcd45e21b7d2a2e4edb8235d2d35245c4e891362a2597c9b724cee93ec885c50259763e3d06f2d82cdbe3ee -LibGit2.v1.8.4+0.x86_64-unknown-freebsd.tar.gz/md5/01bb75c5eda895d47a55b9a231c0977e -LibGit2.v1.8.4+0.x86_64-unknown-freebsd.tar.gz/sha512/ba4ba6e681faf3d768d6a09d6ad0f82934fcbf635d42d4e92a9f0a2d545733757cebff759a720d79981eac8046f278c17b9ea982db3a0b7b774af686b790960b -LibGit2.v1.8.4+0.x86_64-w64-mingw32.tar.gz/md5/37f1e39363db20979948f9a1ebdf312f -LibGit2.v1.8.4+0.x86_64-w64-mingw32.tar.gz/sha512/d74108deed353ec26a56d020f533bdc35a881d640d621292e08ab259461f132e19afbdfee0e21915e6f54b7f0debc9cf4f5959d711104534e0ec85d3fe3a0ac1 -libgit2-3f4182d15eab74a302718f2de454ffadb1995626.tar.gz/md5/c502ae54871bd3afc0bd593a5cf05d68 -libgit2-3f4182d15eab74a302718f2de454ffadb1995626.tar.gz/sha512/7381abb66b42d8b667be12afa360a855627149d1f293a3091c05f02a528fdcc9e44fd7a5adebba8b30ee4ac1f4d1f029a2f0d0b49ada97a751159e0a61f8a54e +LibGit2.v1.9.0+0.aarch64-apple-darwin.tar.gz/md5/1e22c2cf3e6003addd9bf16026ac4a06 +LibGit2.v1.9.0+0.aarch64-apple-darwin.tar.gz/sha512/78d5e5d246534164e1d70cf69dea273bbb8386df24c13fc3c3571762df15f2714307e7ff4cae6f977eee9def121c94cfe33cfcd44a60905a8161d65d17565e90 +LibGit2.v1.9.0+0.aarch64-linux-gnu.tar.gz/md5/70bfe9da256442ea2c295a016a89d3b9 +LibGit2.v1.9.0+0.aarch64-linux-gnu.tar.gz/sha512/14916a5521aa1281b443e61beee2573bc55b76d88810a3bec8bdea677d95763da82f1a527975cdabcdaa213e69aa1640201a03656bdb505b886906795aad0c74 +LibGit2.v1.9.0+0.aarch64-linux-musl.tar.gz/md5/62f6e885de29a345cc5ee3e773c74471 +LibGit2.v1.9.0+0.aarch64-linux-musl.tar.gz/sha512/09e793209505ea954e608c609138b8865d8a1630340fa8ff032a55234bfb8277d2c3c31f26048ae4993bf8c3d8f165abd0b4ccd80526c61efca0807f634572df +LibGit2.v1.9.0+0.aarch64-unknown-freebsd.tar.gz/md5/6fcba6e43265aa7a1ea5bba85977d622 +LibGit2.v1.9.0+0.aarch64-unknown-freebsd.tar.gz/sha512/34b836d3c22436e74963141dbe1f9372cb7ee695ebb2054ee0af1353d4401e1dfb855e91341a1d06a24ce18d57caaa3aa1e2bc7063000fa4f9be40130eb6ff95 +LibGit2.v1.9.0+0.armv6l-linux-gnueabihf.tar.gz/md5/75ede2c2c7312adf06a2a9859cd6310f +LibGit2.v1.9.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/9de567bee3aad33eebac51ad5b57b4fefaa4b778ce8510b2524a55cd223bfaf3051fd48c8713741e799d1464b308469580716dcb847a6eb97fd632727ca22a7d +LibGit2.v1.9.0+0.armv6l-linux-musleabihf.tar.gz/md5/e5341f0c76c89273c465cb43cbf0f284 +LibGit2.v1.9.0+0.armv6l-linux-musleabihf.tar.gz/sha512/1029d47c82ce20223b1c108da77a1a32ef0b91b9645040c1d941e7abdd161011736a81f4ad25006b32d83d4c07c548fcf1c8a3326cf3cb91d56fd443e2e9ced7 +LibGit2.v1.9.0+0.armv7l-linux-gnueabihf.tar.gz/md5/03191a1c4ff1c1ae764092b26c941783 +LibGit2.v1.9.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/6bb113c722b550fb28fc84033a3a38565ed5305a7fa193eeb4949b979fcf4599b84c748f50dad2ad47481827138a6e405eaf727f719d219984a809088bbb2948 +LibGit2.v1.9.0+0.armv7l-linux-musleabihf.tar.gz/md5/1678d6e57aa887963b27917c884cbf36 +LibGit2.v1.9.0+0.armv7l-linux-musleabihf.tar.gz/sha512/52590e9ca4118e0dec70191353b2c76155363df77df6c0bb5741dfb3f333539a8ad75339796748a744c342b51c15869726cfe9bbf6ca78d524e7d2ccce4a4622 +LibGit2.v1.9.0+0.i686-linux-gnu.tar.gz/md5/3fc50746cb80e0455f8e7c7622cd433a +LibGit2.v1.9.0+0.i686-linux-gnu.tar.gz/sha512/20c97e1a816456267a16759378a5e968e6bca122d1e0dc7cc282cad2bf2a8e3929e90373752065d91dfb6688e39ac6db660d9bdbb3277f1b9cb04b5d3f46fd8c +LibGit2.v1.9.0+0.i686-linux-musl.tar.gz/md5/fadb5e051e3b21e68a61b2a3049f65c7 +LibGit2.v1.9.0+0.i686-linux-musl.tar.gz/sha512/369c8c64df89149e9ed600028c1ac96db24e7b2c1977146667b8aeba93aa7a3b4787a49734411448680654188ece33e740fa475108b80b876a5082edad722925 +LibGit2.v1.9.0+0.i686-w64-mingw32.tar.gz/md5/610da247e41070b73e71df7e41267846 +LibGit2.v1.9.0+0.i686-w64-mingw32.tar.gz/sha512/d5b61c885133e3002e48e0fc37ceed0bfeef070e8fc6b2d78ec5f3069ad80966ea5b3a2b3aeae1ca478e9a2f839309fd67c3a186ecf751f4642ff4cb4ca3cb38 +LibGit2.v1.9.0+0.powerpc64le-linux-gnu.tar.gz/md5/f05f5f07de55fd297c564b6cd4e54747 +LibGit2.v1.9.0+0.powerpc64le-linux-gnu.tar.gz/sha512/57b740ca3ef6b18994386d74f1cf39c97c1f58f5a63e749c1a0dcef8c43a915f13cc093a8e1d06cef1d1c60cf484ba0e38d20a96344df69dfc997daa63ee1137 +LibGit2.v1.9.0+0.riscv64-linux-gnu.tar.gz/md5/b043226b10e5cbbe4914be3392f5bf72 +LibGit2.v1.9.0+0.riscv64-linux-gnu.tar.gz/sha512/a580795dd9a7ee237cd1d51d55f5079588686b1adfe391a017de743946e1bd4e7d5e4f8b79a6f84f0ce165733ca1b67ea740d06fa18547c29616df2f73e3f289 +LibGit2.v1.9.0+0.x86_64-apple-darwin.tar.gz/md5/bad8607d4997ef82cd43edfc7579d0fb +LibGit2.v1.9.0+0.x86_64-apple-darwin.tar.gz/sha512/c7359d79949a6727973b1df2264b672bfcd1617b6d4c74d281ef70ac93bcadfe47f99f7a5d031eed36b65077668ba12f2b31bbe6d491542b6938816659070317 +LibGit2.v1.9.0+0.x86_64-linux-gnu.tar.gz/md5/21e5fd214a6358f643477973c22ec70c +LibGit2.v1.9.0+0.x86_64-linux-gnu.tar.gz/sha512/9e68cb6d25d85ad272fcb0d77deedce2daa9c62d7ce2fd7e9221647d021aa00e372f490ad29211d7ca2b5ddefb4addcc4733e25e3df038aaf26fe3cb269d8f56 +LibGit2.v1.9.0+0.x86_64-linux-musl.tar.gz/md5/e9ad320825b22ee378b33856ca266b12 +LibGit2.v1.9.0+0.x86_64-linux-musl.tar.gz/sha512/bd33b4d31a7622a0440bd0979ecc7bbdef7ba7a52bfc911f880c9430d57d2b9ea1c6c4e57697b5a2b63c2e00e07673b3dad6feac056a4f345ed6e3b0ef7aef77 +LibGit2.v1.9.0+0.x86_64-unknown-freebsd.tar.gz/md5/501c63c8810616e6764ff80c23fff0b5 +LibGit2.v1.9.0+0.x86_64-unknown-freebsd.tar.gz/sha512/109e5676899ba6992a68fcff6d7503f49cc3b748b4b0faffcf951f318f9730e242914b57a7848111e229642070fdbce29bc181cbc79ac2e794c6ef489bb27293 +LibGit2.v1.9.0+0.x86_64-w64-mingw32.tar.gz/md5/4e76fa8356407a7065b50298817ad462 +LibGit2.v1.9.0+0.x86_64-w64-mingw32.tar.gz/sha512/01204b29ff2f90a9204d2e91fb7d48a3b6bea008a77984e3e67423a04f630690073d648a7200168809999aa5885fa6035c5b099256724b0379229c257ef19b9f +libgit2-338e6fb681369ff0537719095e22ce9dc602dbf0.tar.gz/md5/0ce4a212921ef1752ea057a3be45e384 +libgit2-338e6fb681369ff0537719095e22ce9dc602dbf0.tar.gz/sha512/4eb018a85a59c6ac0514f09f19a40813d8a4bc5ea230bf54897aa2ef5f584796e8c680a27ac68985a3457e1ea1f554ba4af803b430d67a9065cf51ff317d7a89 diff --git a/deps/libgit2.version b/deps/libgit2.version index 9b908cff803e3..57744b6c96d8e 100644 --- a/deps/libgit2.version +++ b/deps/libgit2.version @@ -3,8 +3,8 @@ LIBGIT2_JLL_NAME := LibGit2 ## source build -LIBGIT2_BRANCH=v1.8.4 -LIBGIT2_SHA1=3f4182d15eab74a302718f2de454ffadb1995626 +LIBGIT2_BRANCH=v1.9.0 +LIBGIT2_SHA1=338e6fb681369ff0537719095e22ce9dc602dbf0 ## Other deps # Specify the version of the Mozilla CA Certificate Store to obtain. diff --git a/stdlib/LibGit2/src/consts.jl b/stdlib/LibGit2/src/consts.jl index 8c140e8c2aa30..1a523b381982b 100644 --- a/stdlib/LibGit2/src/consts.jl +++ b/stdlib/LibGit2/src/consts.jl @@ -45,8 +45,7 @@ const BLAME_USE_MAILMAP = Cuint(1 << 5) const BLAME_IGNORE_WHITESPACE = Cuint(1 << 6) # checkout -const CHECKOUT_NONE = Cuint(0) -const CHECKOUT_SAFE = Cuint(1 << 0) +const CHECKOUT_SAFE = Cuint(0) const CHECKOUT_FORCE = Cuint(1 << 1) const CHECKOUT_RECREATE_MISSING = Cuint(1 << 2) const CHECKOUT_ALLOW_CONFLICTS = Cuint(1 << 4) @@ -67,6 +66,7 @@ const CHECKOUT_DONT_REMOVE_EXISTING = Cuint(1 << 22) const CHECKOUT_DONT_WRITE_INDEX = Cuint(1 << 23) const CHECKOUT_DRY_RUN = Cuint(1 << 24) const CHECKOUT_CONFLICT_STYLE_ZDIFF3 = Cuint(1 << 25) +const CHECKOUT_NONE = Cuint(1 << 30) const CHECKOUT_UPDATE_SUBMODULES = Cuint(1 << 16) const CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = Cuint(1 << 17) diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl index 9228bec175737..181baa4991a9b 100644 --- a/stdlib/LibGit2/src/types.jl +++ b/stdlib/LibGit2/src/types.jl @@ -237,6 +237,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.org/libgit2/#HEAD/type/git_ @static if LibGit2.VERSION >= v"0.99.0" resolve_url::Ptr{Cvoid} = C_NULL end + @static if LibGit2.VERSION >= v"1.9.0" + update_refs::Ptr{Cvoid} = C_NULL + end end @assert Base.allocatedinline(RemoteCallbacks) @@ -924,7 +927,9 @@ struct ConfigEntry end include_depth::Cuint level::GIT_CONFIG - free::Ptr{Cvoid} + @static if LibGit2.VERSION < v"1.9.0" + free::Ptr{Cvoid} + end @static if LibGit2.VERSION < v"1.8.0" # In 1.8.0, the unused payload value has been removed payload::Ptr{Cvoid} @@ -936,6 +941,17 @@ function Base.show(io::IO, ce::ConfigEntry) print(io, "ConfigEntry(\"", unsafe_string(ce.name), "\", \"", unsafe_string(ce.value), "\")") end +""" + LibGit2.ConfigBackendEntry + +Matches the [`git_config_backend_entry`](https://libgit2.org/libgit2/#HEAD/type/git_config_backend_entry) struct. +""" +struct ConfigBackendEntry + entry::ConfigEntry + free::Ptr{Cvoid} +end +@assert Base.allocatedinline(ConfigBackendEntry) + """ LibGit2.split_cfg_entry(ce::LibGit2.ConfigEntry) -> Tuple{String,String,String,String} @@ -1138,15 +1154,20 @@ The fields represent: * `final_commit_id`: the [`GitHash`](@ref) of the commit where this section was last changed. * `final_start_line_number`: the *one based* line number in the file where the hunk starts, in the *final* version of the file. - * `final_signature`: the signature of the person who last modified this hunk. You will + * `final_signature`: the signature of the author of `final_commit_id`. You will + need to pass this to `Signature` to access its fields. + * `final_committer`: the signature of the committer of `final_commit_id`. You will need to pass this to `Signature` to access its fields. * `orig_commit_id`: the [`GitHash`](@ref) of the commit where this hunk was first found. * `orig_path`: the path to the file where the hunk originated. This may be different than the current/final path, for instance if the file has been moved. * `orig_start_line_number`: the *one based* line number in the file where the hunk starts, in the *original* version of the file at `orig_path`. - * `orig_signature`: the signature of the person who introduced this hunk. You will + * `orig_signature`: the signature of the author who introduced this hunk. You will + need to pass this to `Signature` to access its fields. + * `orig_committer`: the signature of the committer who introduced this hunk. You will need to pass this to `Signature` to access its fields. + * `summary`: a string summary. * `boundary`: `'1'` if the original commit is a "boundary" commit (for instance, if it's equal to an oldest commit set in `options`). """ @@ -1156,12 +1177,21 @@ The fields represent: final_commit_id::GitHash = GitHash() final_start_line_number::Csize_t = Csize_t(0) final_signature::Ptr{SignatureStruct} = Ptr{SignatureStruct}(C_NULL) + @static if LibGit2.VERSION >= v"1.9.0" + final_committer::Ptr{SignatureStruct} = Ptr{SignatureStruct}(C_NULL) + end orig_commit_id::GitHash = GitHash() orig_path::Cstring = Cstring(C_NULL) orig_start_line_number::Csize_t = Csize_t(0) orig_signature::Ptr{SignatureStruct} = Ptr{SignatureStruct}(C_NULL) + @static if LibGit2.VERSION >= v"1.9.0" + orig_committer::Ptr{SignatureStruct} = Ptr{SignatureStruct}(C_NULL) + end + @static if LibGit2.VERSION >= v"1.9.0" + summary::Cstring = Cstring(C_NULL) + end boundary::Char = '\0' end @assert Base.allocatedinline(BlameHunk) diff --git a/stdlib/LibGit2/test/libgit2-tests.jl b/stdlib/LibGit2/test/libgit2-tests.jl index 1dfa5429368b6..b186f67c65cf1 100644 --- a/stdlib/LibGit2/test/libgit2-tests.jl +++ b/stdlib/LibGit2/test/libgit2-tests.jl @@ -1152,6 +1152,7 @@ mktempdir() do dir function setup_clone_repo(cache_repo::AbstractString, path::AbstractString; name="AAAA", email="BBBB@BBBB.COM") repo = LibGit2.clone(cache_repo, path) + LibGit2.fetch(repo) # need to set this for merges to succeed cfg = LibGit2.GitConfig(repo) LibGit2.set!(cfg, "user.name", name) diff --git a/stdlib/LibGit2_jll/Project.toml b/stdlib/LibGit2_jll/Project.toml index 6d3a17bb02cf8..216fe9c3c6b41 100644 --- a/stdlib/LibGit2_jll/Project.toml +++ b/stdlib/LibGit2_jll/Project.toml @@ -1,6 +1,6 @@ name = "LibGit2_jll" uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.8.4+0" +version = "1.9.0+0" [deps] OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95" diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl index b7ed19a939c5e..c69deb4a9d932 100644 --- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl +++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl @@ -24,9 +24,9 @@ libgit2_path::String = "" if Sys.iswindows() const libgit2 = "libgit2.dll" elseif Sys.isapple() - const libgit2 = "@rpath/libgit2.1.8.dylib" + const libgit2 = "@rpath/libgit2.1.9.dylib" else - const libgit2 = "libgit2.so.1.8" + const libgit2 = "libgit2.so.1.9" end function __init__() diff --git a/stdlib/LibGit2_jll/test/runtests.jl b/stdlib/LibGit2_jll/test/runtests.jl index 6cf2d2b8a568d..06edefe335a2f 100644 --- a/stdlib/LibGit2_jll/test/runtests.jl +++ b/stdlib/LibGit2_jll/test/runtests.jl @@ -7,5 +7,5 @@ using Test, Libdl, LibGit2_jll minor = Ref{Cint}(0) patch = Ref{Cint}(0) @test ccall((:git_libgit2_version, libgit2), Cint, (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, patch) == 0 - @test VersionNumber(major[], minor[], patch[]) == v"1.8.4" + @test VersionNumber(major[], minor[], patch[]) == v"1.9.0" end diff --git a/stdlib/Manifest.toml b/stdlib/Manifest.toml index 63da40a5630f5..07807ecd454a0 100644 --- a/stdlib/Manifest.toml +++ b/stdlib/Manifest.toml @@ -103,7 +103,7 @@ version = "1.11.0" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.8.4+0" +version = "1.9.0+0" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "OpenSSL_jll"]