Skip to content

Commit f25babf

Browse files
committed
build: upgrade git2 from v0.16.1 to v0.17.0
1 parent 8385f96 commit f25babf

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

git-branchless-invoke/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ color-eyre = "0.6.2"
1414
cursive_core = "0.3.6"
1515
eyre = "0.6.8"
1616
git-branchless-opts = { version = "0.7.0", path = "../git-branchless-opts" }
17-
git2 = { version = "0.16.1", default-features = false }
17+
git2 = { version = "0.17.0", default-features = false }
1818
lib = { package = "git-branchless-lib", version = "0.7.0", path = "../git-branchless-lib" }
1919
tracing = "0.1.37"
2020
tracing-chrome = "0.6.0"

git-branchless-lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ eden_dag = { package = "esl01-dag", version = "0.3.0" }
5656
eyre = "0.6.8"
5757
futures = "0.3.28"
5858
git-record = { version = "0.3", path = "../git-record" }
59-
git2 = { version = "0.16.1", default-features = false }
59+
git2 = { version = "0.17.0", default-features = false }
6060
indicatif = { version = "0.17.3", features = ["improved_unicode"] }
6161
itertools = "0.10.3"
6262
lazy_static = "1.4.0"

git-branchless-lib/src/git/status.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ pub enum FileMode {
6868
Tree,
6969
Blob,
7070
BlobExecutable,
71+
BlobGroupWritable,
7172
Link,
7273
Commit,
7374
}
@@ -77,6 +78,7 @@ impl From<git2::FileMode> for FileMode {
7778
match file_mode {
7879
git2::FileMode::Blob => FileMode::Blob,
7980
git2::FileMode::BlobExecutable => FileMode::BlobExecutable,
81+
git2::FileMode::BlobGroupWritable => FileMode::BlobGroupWritable,
8082
git2::FileMode::Commit => FileMode::Commit,
8183
git2::FileMode::Link => FileMode::Link,
8284
git2::FileMode::Tree => FileMode::Tree,
@@ -108,6 +110,7 @@ impl From<FileMode> for i32 {
108110
match file_mode {
109111
FileMode::Blob => git2::FileMode::Blob.into(),
110112
FileMode::BlobExecutable => git2::FileMode::BlobExecutable.into(),
113+
FileMode::BlobGroupWritable => git2::FileMode::BlobGroupWritable.into(),
111114
FileMode::Commit => git2::FileMode::Commit.into(),
112115
FileMode::Link => git2::FileMode::Link.into(),
113116
FileMode::Tree => git2::FileMode::Tree.into(),
@@ -134,6 +137,7 @@ impl FromStr for FileMode {
134137
"040000" => FileMode::Tree,
135138
"100644" => FileMode::Blob,
136139
"100755" => FileMode::BlobExecutable,
140+
"100664" => FileMode::BlobGroupWritable,
137141
"120000" => FileMode::Link,
138142
"160000" => FileMode::Commit,
139143
_ => eyre::bail!("unknown file mode: {}", file_mode),
@@ -149,6 +153,7 @@ impl ToString for FileMode {
149153
FileMode::Tree => "040000".to_string(),
150154
FileMode::Blob => "100644".to_string(),
151155
FileMode::BlobExecutable => "100755".to_string(),
156+
FileMode::BlobGroupWritable => "100664".to_string(),
152157
FileMode::Link => "120000".to_string(),
153158
FileMode::Commit => "160000".to_string(),
154159
}

0 commit comments

Comments
 (0)