extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-11-26 02:04:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: gitoxide upgrade (#4319)

Browse Source 
adjustments to upgrade to gitoxide v0.22.1
This commit is contained in:
Sebastian Thiel 2022-08-27 20:24:18 +08:00 committed by GitHub
parent db790324a4
commit dd918296e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 86 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
Cargo.lock generated
View File

@ -921,9 +921,9 @@ dependencies = [
[[package]]
name = "git-actor"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fb53b8b0a098e3db89958c0aa36e1cbaa5e80fdfc98a7535e7078552120cc03"
checksum = "5f71e800c934ad4cb177a1a396a6ea57e4cb493bd5278d350752205570863478"
dependencies = [
"bstr",
"btoi",
@ -935,9 +935,9 @@ dependencies = [
[[package]]
name = "git-attributes"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51845b670130052b90b0938d97d9507c81f3e81f355b232d024729a771293b82"
checksum = "9fd272a7ccd728534d36965123516057c2d605a9b73454c13e481f0b7c5e3b31"
dependencies = [
"bstr",
"compact_str",
@ -951,27 +951,27 @@ dependencies = [
[[package]]
name = "git-bitmap"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5442ba44b4385121a333f56837f3e6ce5a1b843d080b93d764578960a510507b"
checksum = "327098a7ad27ae298d7e71602dbd4375cc828d755d10a720e4be0be1b4ec38f0"
dependencies = [
"quick-error",
]
[[package]]
name = "git-chunk"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c915097c009d7870a27ee62dcadbf1410f07cdc6c510efcfb8c1011917bd4f22"
checksum = "0023a89f84bcc8600556630109edfad1bdeb1820ea8a77306a7ca9c01188ef97"
dependencies = [
"quick-error",
]
[[package]]
name = "git-config"
version = "0.6.1"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "168f2e6bec559afb1e029510ee1746f0971fd35bbd5c20bf43c9df74e32be8f8"
checksum = "3f873c1aa1d8340ad156181ac425c8bbd696534d94821d5bcd8c576bbfc13856"
dependencies = [
"bitflags",
"bstr",
@ -990,9 +990,9 @@ dependencies = [
[[package]]
name = "git-date"
version = "0.0.4"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2c5b328bf9081b27042a274c895758df97309275e618e4fcfede919ce3d282"
checksum = "1d58ccaaf783384a6ad68a6abf84942a3f88e34970ced3b34dc68183be50996d"
dependencies = [
"bstr",
"itoa",
@ -1001,9 +1001,9 @@ dependencies = [
[[package]]
name = "git-diff"
version = "0.17.1"
version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7a3d2379658de2bf9b25e730ca8e486d66f1f9515e7f82b1d165f5e0afec742"
checksum = "3eb6ff7cebb31c3c5285cc887f513509797fd73598ec9b346ace58bdf6597689"
dependencies = [
"git-hash",
"git-object",
@ -1012,9 +1012,9 @@ dependencies = [
[[package]]
name = "git-discover"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cf1909f287bd3365dabdbb657f78f02c2ef496001db782f6137588c9668623a"
checksum = "74e956f5d946471c9edba2781e081340a2147a3046b1f183727aadca3b3df547"
dependencies = [
"bstr",
"git-hash",
@ -1026,9 +1026,9 @@ dependencies = [
[[package]]
name = "git-features"
version = "0.22.2"
version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ed4ee460edb68580e3685a6d20d9c1bd0dabed564667f5273fa8b0871380b64"
checksum = "e1aebbcd709f9a324d3b881801b0e30af616d51ae1a6619b36aee5dc81960131"
dependencies = [
"crc32fast",
"crossbeam-channel",
@ -1042,16 +1042,16 @@ dependencies = [
"parking_lot 0.12.1",
"prodash",
"quick-error",
"sha-1",
"sha1 0.10.1",
"sha1_smol",
"walkdir",
]
[[package]]
name = "git-glob"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a226a7037e481a312ddba5cc55f6d7aa3eb5043d61e95c289af3632be942f0e"
checksum = "3d1879e27b5cb57bee828ea57a1ce9a004e9ae51fa71a2d4fb031175386df246"
dependencies = [
"bitflags",
"bstr",
@ -1069,9 +1069,9 @@ dependencies = [
[[package]]
name = "git-index"
version = "0.4.1"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80691537dd8702a4dc317a1aebc969fae51b0dc995e44e07203cfcb60d49efef"
checksum = "2032b59abc5b4029498f41373f4567568f835629fe7963bf11c4cf8881a6eab2"
dependencies = [
"atoi",
"bitflags",
@ -1089,9 +1089,9 @@ dependencies = [
[[package]]
name = "git-lock"
version = "2.1.0"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee44915b070cde930ecc0e251d53f40d2ad66354546edcfd04720b12e1936e91"
checksum = "2ff6ad736a93573e219cb9b81c2edb6df0ced812f886e8003df375d96e650e73"
dependencies = [
"fastrand",
"git-tempfile",
@ -1100,9 +1100,9 @@ dependencies = [
[[package]]
name = "git-object"
version = "0.20.1"
version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2873d25c73b490aad3897d12f5d1bb9e91404590f37dcf9b72d229972192c07c"
checksum = "5045f17a3fba3e1668571ec725fd45f948c901bb2562c72ee8e6be7aaa8f7a6f"
dependencies = [
"bstr",
"btoi",
@ -1119,9 +1119,9 @@ dependencies = [
[[package]]
name = "git-odb"
version = "0.31.1"
version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e69359d85f7dbbe05984024e63e581092ef38bdf0f12c461077d190fe47b061d"
checksum = "44578bb80d492d4569eb07426c069f2cc6985af8a3ed9b895f8d8ac6112ab390"
dependencies = [
"arc-swap",
"git-features",
@ -1137,9 +1137,9 @@ dependencies = [
[[package]]
name = "git-pack"
version = "0.21.1"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89910dcf8ea9befe504e6373832b38c9da49e8dd830206c7f9deae29f1e1d58c"
checksum = "84efc688a585c627f782c6b1ba06bc8a7450131e4dda240386bff1ee705e009f"
dependencies = [
"bytesize",
"clru",
@ -1162,9 +1162,9 @@ dependencies = [
[[package]]
name = "git-path"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f054752f9f73d557f4ef0a4e48f2f7e01454abd7accdef9f85f0ef4fa2c6e8f"
checksum = "eb95b96097d742975f700c6a125ab447b051787eec322e3f6e59e83c867dea40"
dependencies = [
"bstr",
"thiserror",
@ -1172,9 +1172,9 @@ dependencies = [
[[package]]
name = "git-quote"
version = "0.2.0"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ec1960fa4f68a1637ce03d8c151ae2f8565d1de119a3eee8b5b9a364a08aacb"
checksum = "38e200d7357e12e0676cd3348176665f90f9a6139caa87ca49a19a6dd6e996cf"
dependencies = [
"bstr",
"btoi",
@ -1183,9 +1183,9 @@ dependencies = [
[[package]]
name = "git-ref"
version = "0.15.1"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95c37be789a743f28b1430c9d6096fa637eb696746ae88b76c4b96112e802c8f"
checksum = "97982aefe48e8ff0c9e0c3bb2c9f9388c9653072fa8706aaa87ac8c90e2dfa4a"
dependencies = [
"git-actor",
"git-features",
@ -1201,10 +1201,24 @@ dependencies = [
]
[[package]]
name = "git-repository"
version = "0.21.1"
name = "git-refspec"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09bc3239f9e983ee0bf87a952644bde5b6344219fab54acba959365852b319ea"
checksum = "32886438939729151852fb2379007a3f17695232cdc65a81c7e757ae4b587b71"
dependencies = [
"bstr",
"git-hash",
"git-revision",
"git-validate",
"smallvec",
"thiserror",
]
[[package]]
name = "git-repository"
version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13a607977b24ff29831297c80ae3b24bd45b04f81f3ca3047744453d6ae6e920"
dependencies = [
"byte-unit",
"clru",
@ -1224,6 +1238,7 @@ dependencies = [
"git-pack",
"git-path",
"git-ref",
"git-refspec",
"git-revision",
"git-sec",
"git-tempfile",
@ -1240,9 +1255,9 @@ dependencies = [
[[package]]
name = "git-revision"
version = "0.4.1"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66fc0b04b5160de248d4ef2248d41d38dac53388dade1a547dd954dead01c62b"
checksum = "1877eb33a9caf9cbb5438d9358ebaf16b858f0e4f502b1c07bf0b1c512b90922"
dependencies = [
"bstr",
"git-date",
@ -1254,9 +1269,9 @@ dependencies = [
[[package]]
name = "git-sec"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffcecb38973b7c8fb3be5ae855a366a1e615fe1b7cf38d217f3e1adeb3608170"
checksum = "0073a138d171b64d5251726620c2232f695f7fbcfa7e5678dc62c1c19846f0e5"
dependencies = [
"bitflags",
"dirs 4.0.0",
@ -1268,9 +1283,9 @@ dependencies = [
[[package]]
name = "git-tempfile"
version = "2.0.2"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c1d7753a96a332e404d6f985caa41bcbd6f08a8e40b4f452dd5e3985d4c4e8e"
checksum = "baed392d47397d32d29be06bc09824a259a44df85614fd301ef98e69770a15b9"
dependencies = [
"dashmap",
"libc",
@ -1282,9 +1297,9 @@ dependencies = [
[[package]]
name = "git-traverse"
version = "0.16.1"
version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c89b9468cd57d145b8bc06f1a8e867b8ed5044c3f856cc7b98a9aac97f9163aa"
checksum = "5edc8f220eb957d4ddba19bf42dca323a3e584d067634946a3bf30cca4383052"
dependencies = [
"git-hash",
"git-object",
@ -1294,23 +1309,23 @@ dependencies = [
[[package]]
name = "git-url"
version = "0.7.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7efc31fd6bb3a52a18006dfaf686e3ba4d0d7ad0ca325bfc7d719affd28dc624"
checksum = "e7805eb7dddaf2d4097495e7bee7611385a7d9ac7b5991e11500e616f559e4af"
dependencies = [
"bstr",
"git-features",
"git-path",
"home",
"quick-error",
"thiserror",
"url",
]
[[package]]
name = "git-validate"
version = "0.5.4"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c2c1eaaa942eb3c49ab20f27c0715e79e26e6b156a0f77d7ed7bbb26126a8fa"
checksum = "7af1453adfe6011f0ef71824591b7cdd85850c27bbf3dc8fa855574bed2fe107"
dependencies = [
"bstr",
"quick-error",
@ -1318,9 +1333,9 @@ dependencies = [
[[package]]
name = "git-worktree"
version = "0.4.1"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "779a6a2a0d51b690fdf1e0024138a2f320be89db7fc2e7f5becd20e65aa42344"
checksum = "5f4f5175b6a78a8689d86d9e53ac767f69a8472a6c4b20f8d16fd9a0bf84ba3a"
dependencies = [
"bstr",
"git-attributes",
@ -2533,7 +2548,6 @@ dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"digest 0.10.3",
"sha1-asm",
]
[[package]]
@ -2545,6 +2559,18 @@ dependencies = [
"sha1_smol",
]
[[package]]
name = "sha1"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"digest 0.10.3",
"sha1-asm",
]
[[package]]
name = "sha1-asm"
version = "0.5.1"
@ -3535,7 +3561,7 @@ dependencies = [
"rand 0.8.5",
"serde",
"serde_repr",
"sha1",
"sha1 0.6.1",
"static_assertions",
"tracing",
"uds_windows",

4
Cargo.toml
View File

@ -43,8 +43,8 @@ dirs-next = "2.0.0"
dunce = "1.0.2"
gethostname = "0.2.3"
# Addresses https://github.com/starship/starship/issues/4251
git-features = { version = "0.22.2", features = ["fs-walkdir-single-threaded"] }
git-repository = "0.21.1"
git-features = { version = "0.22.3", features = ["fs-walkdir-single-threaded"] }
git-repository = "0.22.1"
indexmap = { version = "1.9.1", features = ["serde"] }
local_ipaddress = "0.1.3"
log = { version = "0.4.16", features = ["std"] }

2
src/context.rs
View File

@ -629,7 +629,7 @@ fn get_remote_repository_info(
) -> Option<Remote> {
let branch_name = branch_name?;
let branch = repository
.remote_ref(branch_name)
.branch_remote_ref(branch_name)
.and_then(|r| r.ok())
.map(|r| r.shorten().to_string());
let name = repository