build: upgrade git2 from v0.16.1 to v0.17.0

arxanas · Apr 14, 2023 · f25babf · f25babf
1 parent 8385f96
commit f25babf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/git-branchless-invoke/Cargo.toml b/git-branchless-invoke/Cargo.toml
@@ -14,7 +14,7 @@ color-eyre = "0.6.2"
 cursive_core = "0.3.6"
 eyre = "0.6.8"
 git-branchless-opts = { version = "0.7.0", path = "../git-branchless-opts" }
-git2 = { version = "0.16.1", default-features = false }
+git2 = { version = "0.17.0", default-features = false }
 lib = { package = "git-branchless-lib", version = "0.7.0", path = "../git-branchless-lib" }
 tracing = "0.1.37"
 tracing-chrome = "0.6.0"

diff --git a/git-branchless-lib/Cargo.toml b/git-branchless-lib/Cargo.toml
@@ -56,7 +56,7 @@ eden_dag = { package = "esl01-dag", version = "0.3.0" }
 eyre = "0.6.8"
 futures = "0.3.28"
 git-record = { version = "0.3", path = "../git-record" }
-git2 = { version = "0.16.1", default-features = false }
+git2 = { version = "0.17.0", default-features = false }
 indicatif = { version = "0.17.3", features = ["improved_unicode"] }
 itertools = "0.10.3"
 lazy_static = "1.4.0"

diff --git a/git-branchless-lib/src/git/status.rs b/git-branchless-lib/src/git/status.rs
@@ -68,6 +68,7 @@ pub enum FileMode {
  Tree,
  Blob,
  BlobExecutable,
+ BlobGroupWritable,
  Link,
  Commit,
 }
@@ -77,6 +78,7 @@ impl From<git2::FileMode> for FileMode {
  match file_mode {
  git2::FileMode::Blob => FileMode::Blob,
  git2::FileMode::BlobExecutable => FileMode::BlobExecutable,
+ git2::FileMode::BlobGroupWritable => FileMode::BlobGroupWritable,
  git2::FileMode::Commit => FileMode::Commit,
  git2::FileMode::Link => FileMode::Link,
  git2::FileMode::Tree => FileMode::Tree,
@@ -108,6 +110,7 @@ impl From<FileMode> for i32 {
  match file_mode {
  FileMode::Blob => git2::FileMode::Blob.into(),
  FileMode::BlobExecutable => git2::FileMode::BlobExecutable.into(),
+ FileMode::BlobGroupWritable => git2::FileMode::BlobGroupWritable.into(),
  FileMode::Commit => git2::FileMode::Commit.into(),
  FileMode::Link => git2::FileMode::Link.into(),
  FileMode::Tree => git2::FileMode::Tree.into(),
@@ -134,6 +137,7 @@ impl FromStr for FileMode {
  "040000" => FileMode::Tree,
  "100644" => FileMode::Blob,
  "100755" => FileMode::BlobExecutable,
+ "100664" => FileMode::BlobGroupWritable,
  "120000" => FileMode::Link,
  "160000" => FileMode::Commit,
  _ => eyre::bail!("unknown file mode: {}", file_mode),
@@ -149,6 +153,7 @@ impl ToString for FileMode {
  FileMode::Tree => "040000".to_string(),
  FileMode::Blob => "100644".to_string(),
  FileMode::BlobExecutable => "100755".to_string(),
+ FileMode::BlobGroupWritable => "100664".to_string(),
  FileMode::Link => "120000".to_string(),
  FileMode::Commit => "160000".to_string(),
  }