Add config level for worktrees

Use the new support in libgit2 for the worktree-config extension.[1]

[1]: https://git-scm.com/docs/git-worktree/2.35.1#_configuration_file

Author: vermiculus

libgit2-sys/lib.rs

@@ -868,7 +868,8 @@ git_enum! {
         GIT_CONFIG_LEVEL_XDG = 3,
         GIT_CONFIG_LEVEL_GLOBAL = 4,
         GIT_CONFIG_LEVEL_LOCAL = 5,
-        GIT_CONFIG_LEVEL_APP = 6,
+        GIT_CONFIG_LEVEL_WORKTREE = 6,
+        GIT_CONFIG_LEVEL_APP = 7,
         GIT_CONFIG_HIGHEST_LEVEL = -1,
     }
 }

src/call.rs

@@ -166,6 +166,7 @@ mod impls {
                 ConfigLevel::XDG => raw::GIT_CONFIG_LEVEL_XDG,
                 ConfigLevel::Global => raw::GIT_CONFIG_LEVEL_GLOBAL,
                 ConfigLevel::Local => raw::GIT_CONFIG_LEVEL_LOCAL,
+                ConfigLevel::Worktree => raw::GIT_CONFIG_LEVEL_WORKTREE,
                 ConfigLevel::App => raw::GIT_CONFIG_LEVEL_APP,
                 ConfigLevel::Highest => raw::GIT_CONFIG_HIGHEST_LEVEL,
             }

src/lib.rs

@@ -385,6 +385,8 @@ pub enum ConfigLevel {
     Global,
     /// Repository specific config, e.g. $PWD/.git/config
     Local,
+    /// Worktree-specific config, e.g. $GIT_DIR/config.worktree
+    Worktree,
     /// Application specific configuration file
     App,
     /// Highest level available
@@ -963,6 +965,7 @@ impl ConfigLevel {
             raw::GIT_CONFIG_LEVEL_XDG => ConfigLevel::XDG,
             raw::GIT_CONFIG_LEVEL_GLOBAL => ConfigLevel::Global,
             raw::GIT_CONFIG_LEVEL_LOCAL => ConfigLevel::Local,
+            raw::GIT_CONFIG_LEVEL_WORKTREE => ConfigLevel::Worktree,
             raw::GIT_CONFIG_LEVEL_APP => ConfigLevel::App,
             raw::GIT_CONFIG_HIGHEST_LEVEL => ConfigLevel::Highest,
             n => panic!("unknown config level: {}", n),

tests/add_extensions.rs

@@ -11,11 +11,12 @@ fn test_add_extensions() -> Result<(), Error> {
 
     let extensions = unsafe { get_extensions() }?;
 
-    assert_eq!(extensions.len(), 3);
+    assert_eq!(extensions.len(), 4);
     assert_eq!(extensions.get(0), Some("custom"));
     // The objectformat extension was added in 1.6
     assert_eq!(extensions.get(1), Some("noop"));
     assert_eq!(extensions.get(2), Some("objectformat"));
+    assert_eq!(extensions.get(3), Some("worktreeconfig"));
 
     Ok(())
 }

tests/get_extensions.rs

@@ -7,10 +7,11 @@ use git2::Error;
 fn test_get_extensions() -> Result<(), Error> {
     let extensions = unsafe { get_extensions() }?;
 
-    assert_eq!(extensions.len(), 2);
+    assert_eq!(extensions.len(), 3);
     assert_eq!(extensions.get(0), Some("noop"));
     // The objectformat extension was added in 1.6
     assert_eq!(extensions.get(1), Some("objectformat"));
+    assert_eq!(extensions.get(2), Some("worktreeconfig"));
 
     Ok(())
 }

tests/remove_extensions.rs

@@ -11,9 +11,10 @@ fn test_remove_extensions() -> Result<(), Error> {
 
     let extensions = unsafe { get_extensions() }?;
 
-    assert_eq!(extensions.len(), 2);
+    assert_eq!(extensions.len(), 3);
     assert_eq!(extensions.get(0), Some("custom"));
     assert_eq!(extensions.get(1), Some("other"));
+    assert_eq!(extensions.get(2), Some("worktreeconfig"));
 
     Ok(())
 }