chore: update gix to 0.73

blinxen · blinxen · commit d22f242718c3 · 2025-07-20T19:50:43.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,7 +43,7 @@ clap = { version = "~4.5", default-features = false, features = [
 ctrlc = "3.4"
 encoding_rs = "0.8"
 flate2 = "1"
-gix = { version = "0.71", default-features = false, features = [
+gix = { version = "0.73", default-features = false, features = [
   "command",
   "revision",
 ] }
diff --git a/src/cmd/export.rs b/src/cmd/export.rs
@@ -233,7 +233,12 @@ fn run(matches: &clap::ArgMatches) -> Result<()> {
         replacements.insert("authemail", Cow::Borrowed(author.email));
         replacements.insert(
             "authdate",
-            Cow::Owned(author.time.format(gix::date::time::format::ISO8601).into()),
+            Cow::Owned(
+                author
+                    .time()?
+                    .format(gix::date::time::format::ISO8601)
+                    .into(),
+            ),
         );
         let committer = patch_commit.committer()?;
         replacements.insert("commname", Cow::Borrowed(committer.name));
@@ -242,7 +247,7 @@ fn run(matches: &clap::ArgMatches) -> Result<()> {
             "commdate",
             Cow::Owned(
                 committer
-                    .time
+                    .time()?
                     .format(gix::date::time::format::ISO8601)
                     .into(),
             ),
diff --git a/src/cmd/import.rs b/src/cmd/import.rs
@@ -599,10 +599,10 @@ fn create_patch<'repo>(
             gix::actor::Signature {
                 name: BString::from(name),
                 email: BString::from(email),
-                time: default_author.time,
+                time: default_author.time()?,
             }
         } else {
-            default_author.to_owned()
+            default_author.to_owned()?
         }
     };
 
diff --git a/src/cmd/pick.rs b/src/cmd/pick.rs
@@ -314,11 +314,11 @@ fn pick_picks(
         let author = commit.author_strict()?;
         let default_committer = stack.repo.get_committer()?;
         let committer = if matches.get_flag("committer-date-is-author-date") {
-            let mut committer = default_committer.to_owned();
+            let mut committer = default_committer.to_owned()?;
             committer.time = author.time;
             committer
         } else {
-            default_committer.to_owned()
+            default_committer.to_owned()?
         };
         let parent = if let Some(parent) = opt_parent.as_ref() {
             parent.clone()
@@ -332,8 +332,8 @@ fn pick_picks(
             (commit.clone(), parent)
         };
         let new_commit_id = stack.repo.commit_ex(
-            &author,
-            &committer,
+            author.to_ref(&mut gix::date::parse::TimeBuf::default()),
+            committer.to_ref(&mut gix::date::parse::TimeBuf::default()),
             message,
             top.tree_id()?.detach(),
             [bottom.id],
diff --git a/src/cmd/refresh.rs b/src/cmd/refresh.rs
@@ -181,7 +181,9 @@ fn run(matches: &ArgMatches) -> Result<()> {
 
     // Make temp patch
     let temp_commit_id = stack.repo.commit_ex(
-        &repo.get_author()?.override_author(matches),
+        repo.get_author()?
+            .override_author(matches)
+            .to_ref(&mut gix::date::parse::TimeBuf::default()),
         repo.get_committer()?,
         &Message::from(format!("Refresh of {patchname}")),
         tree_id,
diff --git a/src/cmd/spill.rs b/src/cmd/spill.rs
@@ -101,16 +101,16 @@ fn run(matches: &ArgMatches) -> Result<()> {
     let author = patch_commit.author_strict()?;
     let default_committer = repo.get_committer()?;
     let committer = if matches.get_flag("committer-date-is-author-date") {
-        let mut committer = default_committer.to_owned();
+        let mut committer = default_committer.to_owned()?;
         committer.time = author.time;
         committer
     } else {
-        default_committer.to_owned()
+        default_committer.to_owned()?
     };
 
     let commit_id = repo.commit_ex(
-        &author,
-        &committer,
+        author.to_ref(&mut gix::date::parse::TimeBuf::default()),
+        committer.to_ref(&mut gix::date::parse::TimeBuf::default()),
         &patch_commit.message_ex(),
         tree_id,
         patch_commit_ref.parents(),
diff --git a/src/cmd/sync.rs b/src/cmd/sync.rs
@@ -225,15 +225,15 @@ fn run(matches: &clap::ArgMatches) -> Result<()> {
                     let author = commit.author_strict()?;
                     let default_committer = trans.repo().get_committer()?;
                     let committer = if matches.get_flag("committer-date-is-author-date") {
-                        let mut committer = default_committer.to_owned();
+                        let mut committer = default_committer.to_owned()?;
                         committer.time = author.time;
                         committer
                     } else {
-                        default_committer.to_owned()
+                        default_committer.to_owned()?
                     };
                     let commit_id = trans.repo().commit_ex(
-                        &author,
-                        &committer,
+                        author.to_ref(&mut gix::date::parse::TimeBuf::default()),
+                        committer.to_ref(&mut gix::date::parse::TimeBuf::default()),
                         &commit.message_ex(),
                         tree_id,
                         [parent_id],
diff --git a/src/ext/commit.rs b/src/ext/commit.rs
@@ -53,7 +53,7 @@ impl<'a> CommitExtended<'a> for gix::Commit<'a> {
                 Ok(gix::actor::Signature {
                     name: BString::from(name.as_ref()),
                     email: BString::from(email.as_ref()),
-                    time: sig.time,
+                    time: sig.time()?,
                 })
             } else {
                 Err(anyhow!(
diff --git a/src/ext/repository.rs b/src/ext/repository.rs
@@ -256,8 +256,8 @@ impl RepositoryExtended for gix::Repository {
             let commit_id = self.write_object(&gix::objs::Commit {
                 tree: tree_id,
                 parents: parent_ids.into_iter().collect(),
-                author: author.to_owned(),
-                committer: committer.to_owned(),
+                author: author.to_owned()?,
+                committer: committer.to_owned()?,
                 encoding: commit_encoding.map(|enc| enc.name().into()),
                 message: message.raw_bytes().into(),
                 extra_headers: vec![],
diff --git a/src/patch/edit/mod.rs b/src/patch/edit/mod.rs
@@ -273,7 +273,8 @@ impl<'a, 'repo> EditBuilder<'a, 'repo> {
             // existing patch commit's author is broken, but only if the author
             // signature has to be derived from that commit.
             let patch_commit = patch_commit.expect("existing patch or author overlay is required");
-            if let Some(args_author) = author_from_args(matches, Some(patch_commit.author()?.time))?
+            if let Some(args_author) =
+                author_from_args(matches, Some(patch_commit.author()?.time()?))?
             {
                 Some(args_author)
             } else {
@@ -473,7 +474,7 @@ impl<'a, 'repo> EditBuilder<'a, 'repo> {
                 Some(None) => Some(if let Some(commit) = patch_commit {
                     commit.author_strict()?
                 } else {
-                    repo.get_author()?.to_owned()
+                    repo.get_author()?.to_owned()?
                 }),
                 None => patch_description.author.take(),
             };
@@ -543,11 +544,11 @@ impl<'a, 'repo> EditBuilder<'a, 'repo> {
         };
 
         let committer = if matches.get_flag("committer-date-is-author-date") {
-            let mut committer = default_committer.to_owned();
+            let mut committer = default_committer.to_owned()?;
             committer.time = author.time;
             committer
         } else {
-            default_committer.to_owned()
+            default_committer.to_owned()?
         };
 
         let new_commit_id = if patch_commit
@@ -558,14 +559,22 @@ impl<'a, 'repo> EditBuilder<'a, 'repo> {
                 // N.B.: intentionally not comparing commiter.when()
                 && patch_commit_ref.author().name == author.name
                 && patch_commit_ref.author().email == author.email
-                && patch_commit_ref.author().time == author.time
+                && patch_commit_ref.author().time == author.time.to_str(
+                    &mut gix::date::parse::TimeBuf::default()
+                )
                 && patch_commit_ref.message == message.raw_bytes()
                 && patch_commit_ref.tree() == tree_id
                 && patch_commit_ref.parents().next() == Some(parent_id)
             }) {
             None
         } else {
-            Some(repo.commit_ex(&author, &committer, &message, tree_id, [parent_id])?)
+            Some(repo.commit_ex(
+                author.to_ref(&mut gix::date::parse::TimeBuf::default()),
+                committer.to_ref(&mut gix::date::parse::TimeBuf::default()),
+                &message,
+                tree_id,
+                [parent_id],
+            )?)
         };
 
         let new_patchname = if original_patchname.as_ref() == Some(&patchname) {
diff --git a/src/stack/transaction/mod.rs b/src/stack/transaction/mod.rs
@@ -558,17 +558,17 @@ impl<'repo> StackTransaction<'repo> {
             let author = patch_commit.author_strict()?;
             let default_committer = repo.get_committer()?;
             let committer = if self.options.committer_date_is_author_date {
-                let mut committer = default_committer.to_owned();
+                let mut committer = default_committer.to_owned()?;
                 committer.time = author.time;
                 committer
             } else {
-                default_committer.to_owned()
+                default_committer.to_owned()?
             };
             let message = patch_commit.message_ex();
             let parent_ids = [self.top().id];
             let new_commit_id = repo.commit_ex(
-                &author,
-                &committer,
+                author.to_ref(&mut gix::date::parse::TimeBuf::default()),
+                committer.to_ref(&mut gix::date::parse::TimeBuf::default()),
                 &message,
                 patch_commit.tree_id()?.detach(),
                 parent_ids,
@@ -1111,15 +1111,15 @@ impl<'repo> StackTransaction<'repo> {
         if new_tree_id != patch_commit_ref.tree() || new_parent.id != old_parent.id {
             let author = patch_commit.author_strict()?;
             let committer = if self.options.committer_date_is_author_date {
-                let mut committer = default_committer.to_owned();
+                let mut committer = default_committer.to_owned()?;
                 committer.time = author.time;
                 committer
             } else {
-                default_committer.to_owned()
+                default_committer.to_owned()?
             };
             let commit_id = repo.commit_ex(
-                &author,
-                &committer,
+                author.to_ref(&mut gix::date::parse::TimeBuf::default()),
+                committer.to_ref(&mut gix::date::parse::TimeBuf::default()),
                 &patch_commit.message_ex(),
                 new_tree_id,
                 [new_parent.id],
diff --git a/src/stupid/context.rs b/src/stupid/context.rs
@@ -419,11 +419,11 @@ impl StupidContext<'_, '_> {
             // TODO: re-encode dates?
             .env(
                 "GIT_AUTHOR_DATE",
-                author.time.format(gix::date::time::format::RAW),
+                author.time()?.format(gix::date::time::format::RAW),
             )
             .env(
                 "GIT_COMMITTER_DATE",
-                committer.time.format(gix::date::time::format::RAW),
+                committer.time()?.format(gix::date::time::format::RAW),
             )
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())

Original file line number	Diff line number	Diff line change
`@@ -599,10 +599,10 @@ fn create_patch<'repo>(`
`599`	`599`	`gix::actor::Signature {`
`600`	`600`	`name: BString::from(name),`
`601`	`601`	`email: BString::from(email),`
`602`		`- time: default_author.time,`
	`602`	`+ time: default_author.time()?,`
`603`	`603`	`}`
`604`	`604`	`} else {`
`605`		`- default_author.to_owned()`
	`605`	`+ default_author.to_owned()?`
`606`	`606`	`}`
`607`	`607`	`};`
`608`	`608`