cargo: bump gix to 0.64.0

config.<type>_by_key() is merged with config.<type>().
jj-vcs · Aug 7, 2024 · b3ede64 · b3ede64
1 parent 7bdb28f
commit b3ede64
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,7 +59,7 @@ git2 = { version = "0.18.3", features = [
     # https://github.com/rust-lang/git2-rs/commit/3cef4119f
     "vendored-libgit2"
 ] }
-gix = { version = "0.63.0", default-features = false, features = [
+gix = { version = "0.64.0", default-features = false, features = [
     "index",
     "max-performance-safe",
     "blob-diff",

diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs
@@ -801,9 +801,9 @@ impl WorkspaceCommandHelper {
     #[instrument(skip_all)]
     pub fn base_ignores(&self) -> Result<Arc<GitIgnoreFile>, GitIgnoreError> {
         fn get_excludes_file_path(config: &gix::config::File) -> Option<PathBuf> {
-            // TODO: maybe use path_by_key() and interpolate(), which can process non-utf-8
+            // TODO: maybe use path() and interpolate(), which can process non-utf-8
             // path on Unix.
-            if let Some(value) = config.string_by_key("core.excludesFile") {
+            if let Some(value) = config.string("core.excludesFile") {
                 str::from_utf8(&value)
                     .ok()
                     .map(crate::git_util::expand_git_path)