Merging upstream version 1.70.0+dfsg2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 0 deletions

diff --git a/vendor/gix/src/config/tree/sections/user.rs b/vendor/gix/src/config/tree/sections/user.rs
new file mode 100644
index 000000000..d1f4f7102
--- /dev/null
+++ b/vendor/gix/src/config/tree/sections/user.rs
@@ -0,0 +1,22 @@
+use crate::{
+    config,
+    config::tree::{gitoxide, keys, Key, Section, User},
+};
+
+impl User {
+    /// The `user.name` key
+    pub const NAME: keys::Any = keys::Any::new("name", &config::Tree::USER);
+    /// The `user.email` key
+    pub const EMAIL: keys::Any =
+        keys::Any::new("email", &config::Tree::USER).with_fallback(&gitoxide::User::EMAIL_FALLBACK);
+}
+
+impl Section for User {
+    fn name(&self) -> &str {
+        "user"
+    }
+
+    fn keys(&self) -> &[&dyn Key] {
+        &[&Self::NAME, &Self::EMAIL]
+    }
+}