Re: [PATCH v3 2/3] libgit-rs: add get_bool() method to ConfigSet
From: Phillip Wood <hidden>
Date: 2025-09-29 13:23:46
On 27/09/2025 04:51, ionnss via GitGitGadget wrote:
From: ionnss <redacted> Add support for parsing boolean configuration values using Git's git_configset_get_bool() C function. This ensures consistent behavior with Git's native boolean parsing logic. The method handles all Git boolean formats (true/false, yes/no, on/off, 1/0) and edge cases like "00" and "100" correctly. Includes comprehensive tests for various boolean formats and edge cases.
Unfortunately when I try to run those tests with
make INCLUDE_LIBGIT_RS=1 && cd contrib/libgit-rs && cargo test
I see
= note: /usr/bin/ld:
/home/phil/src/git/update-ref-date/contrib/libgit-rs/target/debug/deps/libgit-8c021564b9d1ec26.9j3smxv8a5f6u8czhaxq401mn.rcgu.o:
in function `libgit::config::ConfigSet::get_bool':
/home/phil/src/git/update-ref-date/contrib/libgit-rs/src/config.rs:78:
undefined reference to `libgit_configset_get_bool'
collect2: error: ld returned 1 exit status
This happens because libgit_configset_get_bool() is not defined in
contrib/libgit-sys/public_symbol_export.[ch]. You need to wrap
configset_get_bool() in the some way that configset_get_int() is.
Thanks
Phillip
quoted hunk ↗ jump to hunk
Signed-off-by: ionnss <redacted> --- contrib/libgit-rs/src/config.rs | 26 ++++++++++++++++++++++++++ contrib/libgit-rs/testdata/config3 | 2 +- contrib/libgit-rs/testdata/config4 | 9 +++++++++ contrib/libgit-sys/src/lib.rs | 6 ++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 contrib/libgit-rs/testdata/config4diff --git a/contrib/libgit-rs/src/config.rs b/contrib/libgit-rs/src/config.rs index 6bf04845c8..72ee88801b 100644 --- a/contrib/libgit-rs/src/config.rs +++ b/contrib/libgit-rs/src/config.rs@@ -68,6 +68,20 @@ impl ConfigSet { Some(owned_str) } } + + /// Load the value for the given key and attempt to parse it as a boolean. Dies with a fatal error + /// if the value cannot be parsed. Returns None if the key is not present. + pub fn get_bool(&mut self, key: &str) -> Option<bool> { + let key = CString::new(key).expect("config key should be valid CString"); + let mut val: c_int = 0; + unsafe { + if libgit_configset_get_bool(self.0, key.as_ptr(), &mut val as *mut c_int) != 0 { + return None; + } + } + + Some(val != 0) + } } impl Default for ConfigSet {@@ -95,6 +109,7 @@ mod tests { Path::new("testdata/config1"), Path::new("testdata/config2"), Path::new("testdata/config3"), + Path::new("testdata/config4"), ]); // ConfigSet retrieves correct value assert_eq!(cs.get_int("trace2.eventTarget"), Some(1));@@ -102,5 +117,16 @@ mod tests { assert_eq!(cs.get_int("trace2.eventNesting"), Some(3)); // ConfigSet returns None for missing key assert_eq!(cs.get_string("foo.bar"), None); + // Test boolean parsing - comprehensive tests + assert_eq!(cs.get_bool("test.boolTrue"), Some(true)); + assert_eq!(cs.get_bool("test.boolFalse"), Some(false)); + assert_eq!(cs.get_bool("test.boolYes"), Some(true)); + assert_eq!(cs.get_bool("test.boolNo"), Some(false)); + assert_eq!(cs.get_bool("test.boolOne"), Some(true)); + assert_eq!(cs.get_bool("test.boolZero"), Some(false)); + assert_eq!(cs.get_bool("test.boolZeroZero"), Some(false)); // "00" → false + assert_eq!(cs.get_bool("test.boolHundred"), Some(true)); // "100" → true + // Test missing boolean key + assert_eq!(cs.get_bool("missing.boolean"), None); } }diff --git a/contrib/libgit-rs/testdata/config3 b/contrib/libgit-rs/testdata/config3 index ca7b9a7c38..3ea5b96f12 100644 --- a/contrib/libgit-rs/testdata/config3 +++ b/contrib/libgit-rs/testdata/config3@@ -1,2 +1,2 @@ [trace2] - eventNesting = 3 + eventNesting = 3\ No newline at end of filediff --git a/contrib/libgit-rs/testdata/config4 b/contrib/libgit-rs/testdata/config4 new file mode 100644 index 0000000000..c0755a32be --- /dev/null +++ b/contrib/libgit-rs/testdata/config4@@ -0,0 +1,9 @@ +[test] + boolTrue = true + boolFalse = false + boolYes = yes + boolNo = no + boolOne = 1 + boolZero = 0 + boolZeroZero = 00 + boolHundred = 100diff --git a/contrib/libgit-sys/src/lib.rs b/contrib/libgit-sys/src/lib.rs index 4bfc650450..b104fda8f6 100644 --- a/contrib/libgit-sys/src/lib.rs +++ b/contrib/libgit-sys/src/lib.rs@@ -43,6 +43,12 @@ extern "C" { dest: *mut *mut c_char, ) -> c_int; + pub fn libgit_configset_get_bool( + cs: *mut libgit_config_set, + key: *const c_char, + dest: *mut c_int, + ) -> c_int; + } #[cfg(test)]