fix: Adapt to changes in gix-actor

Pierre Chevalier · Byron · commit b07f907ba2e0 · 2025-04-25T21:43:07.000+02:00
Use the committer date and author date that are now backed by bytes and
interpret these bytes into a `gix_date::Time` on demand.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -152,6 +152,7 @@ gitoxide-core-async-client = ["gitoxide-core/async-client", "futures-lite"]
 anyhow = "1.0.98"
 
 gitoxide-core = { version = "^0.46.0", path = "gitoxide-core" }
+gix-date= { version = "^0.9.4", path = "gix-date" }
 gix-features = { version = "^0.42.0", path = "gix-features" }
 gix = { version = "^0.71.0", path = "gix", default-features = false }
 
diff --git a/examples/log.rs b/examples/log.rs
@@ -150,7 +150,7 @@ fn run(args: Args) -> anyhow::Result<()> {
                         commit_ref.author.actor().write_to(&mut buf)?;
                         buf.into()
                     },
-                    time: commit_ref.author.time.format(format::DEFAULT),
+                    time: gix_date::Time::from_bytes(commit_ref.author.time)?.format(format::DEFAULT),
                     message: commit_ref.message.to_owned(),
                 })
             }),
diff --git a/gitoxide-core/Cargo.toml b/gitoxide-core/Cargo.toml
@@ -50,6 +50,7 @@ serde = ["gix/serde", "dep:serde_json", "dep:serde", "bytesize/serde"]
 [dependencies]
 # deselect everything else (like "performance") as this should be controllable by the parent application.
 gix = { version = "^0.71.0", path = "../gix", default-features = false, features = ["merge", "blob-diff", "blame", "revision", "mailmap", "excludes", "attributes", "worktree-mutation", "credentials", "interrupt", "status", "dirwalk"] }
+gix-date = { version = "^0.9.4", path = "../gix-date" }
 gix-pack-for-configuration-only = { package = "gix-pack", version = "^0.58.0", path = "../gix-pack", default-features = false, features = ["pack-cache-lru-dynamic", "pack-cache-lru-static", "generate", "streaming-input"] }
 gix-transport-configuration-only = { package = "gix-transport", version = "^0.46.0", path = "../gix-transport", default-features = false }
 gix-archive-for-configuration-only = { package = "gix-archive", version = "^0.20.0", path = "../gix-archive", optional = true, features = ["tar", "tar_gz"] }
diff --git a/gitoxide-core/src/hours/core.rs b/gitoxide-core/src/hours/core.rs
@@ -31,7 +31,7 @@ pub fn estimate_hours(
         let mut cur = commits.next().expect("at least one commit if we are here");
 
         for next in commits {
-            let change_in_minutes = (next.time.seconds.saturating_sub(cur.time.seconds)) as f32 / MINUTES_PER_HOUR;
+            let change_in_minutes = (next.seconds().saturating_sub(cur.seconds())) as f32 / MINUTES_PER_HOUR;
             if change_in_minutes < MAX_COMMIT_DIFFERENCE_IN_MINUTES {
                 hours += change_in_minutes / MINUTES_PER_HOUR;
             } else {
diff --git a/gitoxide-core/src/hours/mod.rs b/gitoxide-core/src/hours/mod.rs
@@ -82,22 +82,16 @@ where
                         };
                         let name = string_ref(author.name.as_ref());
                         let email = string_ref(author.email.as_ref());
+                        let time = string_ref(author.time.as_ref());
 
-                        out.push((
-                            commit_idx,
-                            actor::SignatureRef {
-                                name,
-                                email,
-                                time: author.time,
-                            },
-                        ));
+                        out.push((commit_idx, actor::SignatureRef { name, email, time }));
                     }
                 }
                 out.shrink_to_fit();
                 out.sort_by(|a, b| {
                     a.1.email
                         .cmp(b.1.email)
-                        .then(a.1.time.seconds.cmp(&b.1.time.seconds).reverse())
+                        .then(a.1.seconds().cmp(&b.1.seconds()).reverse())
                 });
                 Ok(out)
             });
diff --git a/gitoxide-core/src/query/engine/command.rs b/gitoxide-core/src/query/engine/command.rs
@@ -76,7 +76,9 @@ impl query::Engine {
                             usize,
                         ) = row?;
                         let id = gix::ObjectId::from(hash);
-                        let commit_time = id.attach(&self.repo).object()?.into_commit().committer()?.time;
+                        let commit_time = gix_date::Time::from_bytes(
+                            id.attach(&self.repo).object()?.into_commit().committer()?.time,
+                        )?;
                         let mode = FileMode::from_usize(mode).context("invalid file mode")?;
                         info.push(trace_path::Info {
                             id,
diff --git a/gitoxide-core/src/repository/archive.rs b/gitoxide-core/src/repository/archive.rs
@@ -84,7 +84,7 @@ fn fetch_rev_info(
     Ok(match object.kind {
         gix::object::Kind::Commit => {
             let commit = object.into_commit();
-            (Some(commit.committer()?.time.seconds), commit.tree_id()?.detach())
+            (Some(commit.committer()?.seconds()), commit.tree_id()?.detach())
         }
         gix::object::Kind::Tree => (None, object.id),
         gix::object::Kind::Tag => fetch_rev_info(object.peel_to_kind(gix::object::Kind::Commit)?)?,
diff --git a/gix-blame/src/file/function.rs b/gix-blame/src/file/function.rs
@@ -672,7 +672,7 @@ type CommitTime = i64;
 fn commit_time(commit: gix_traverse::commit::Either<'_, '_>) -> Result<CommitTime, gix_object::decode::Error> {
     match commit {
         gix_traverse::commit::Either::CommitRefIter(commit_ref_iter) => {
-            commit_ref_iter.committer().map(|c| c.time.seconds)
+            commit_ref_iter.committer().map(|c| c.seconds())
         }
         gix_traverse::commit::Either::CachedCommit(commit) => Ok(commit.committer_timestamp() as i64),
     }
@@ -701,7 +701,7 @@ fn collect_parents(
             for id in commit_ref_iter.parent_ids() {
                 let parent = odb.find_commit_iter(id.as_ref(), buf).ok();
                 let parent_commit_time = parent
-                    .and_then(|parent| parent.committer().ok().map(|committer| committer.time.seconds))
+                    .and_then(|parent| parent.committer().ok().map(|committer| committer.seconds()))
                     .unwrap_or_default();
                 parent_ids.push((id, parent_commit_time));
             }
diff --git a/gix-mailmap/src/snapshot/mod.rs b/gix-mailmap/src/snapshot/mod.rs
@@ -157,17 +157,17 @@ fn enriched_signature<'a>(
         (Some(new_email), Some(new_name)) => Signature {
             email: new_email.to_owned().into(),
             name: new_name.to_owned().into(),
-            time,
+            time: time.into(),
         },
         (Some(new_email), None) => Signature {
             email: new_email.to_owned().into(),
             name: name.into(),
-            time,
+            time: time.into(),
         },
         (None, Some(new_name)) => Signature {
             email: email.into(),
             name: new_name.to_owned().into(),
-            time,
+            time: time.into(),
         },
         (None, None) => unreachable!("BUG: ResolvedSignatures don't exist here when nothing is set"),
     }
diff --git a/gix-mailmap/src/snapshot/signature.rs b/gix-mailmap/src/snapshot/signature.rs
@@ -11,15 +11,15 @@ pub struct Signature<'a> {
     /// The possibly mapped email.
     pub email: Cow<'a, BStr>,
     /// The time stamp at which the signature is performed.
-    pub time: gix_date::Time,
+    pub time: Cow<'a, BStr>,
 }
 
 impl<'a> From<Signature<'a>> for gix_actor::Signature {
     fn from(s: Signature<'a>) -> Self {
         gix_actor::Signature {
             name: s.name.into_owned(),
             email: s.email.into_owned(),
-            time: s.time,
+            time: s.time.into_owned(),
         }
     }
 }
@@ -29,7 +29,7 @@ impl<'a> From<gix_actor::SignatureRef<'a>> for Signature<'a> {
         Signature {
             name: s.name.into(),
             email: s.email.into(),
-            time: s.time,
+            time: s.time.into(),
         }
     }
 }
diff --git a/gix-mailmap/tests/snapshot/mod.rs b/gix-mailmap/tests/snapshot/mod.rs
@@ -161,11 +161,6 @@ fn signature(name: &str, email: &str) -> gix_actor::Signature {
     gix_actor::Signature {
         name: name.into(),
         email: email.into(),
-        time: gix_date::Time {
-            // marker
-            seconds: 42,
-            offset: 53,
-            sign: gix_date::time::Sign::Minus,
-        },
+        time: b"42 +0800".into(),
     }
 }
diff --git a/gix-odb/tests/odb/store/loose.rs b/gix-odb/tests/odb/store/loose.rs
@@ -1,6 +1,5 @@
 use std::sync::atomic::AtomicBool;
 
-use gix_date::{time::Sign, SecondsSinceUnixEpoch, Time};
 use gix_features::progress;
 use gix_object::bstr::ByteSlice;
 use gix_odb::loose::Store;
@@ -285,7 +284,7 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
 "
                 .as_bstr(),
             ),
-            tagger: Some(signature(1528473343)),
+            tagger: Some(signature(b"1528473343 +0200")),
         };
         assert_eq!(o.decode()?.as_tag().expect("tag"), &expected);
         Ok(())
@@ -300,8 +299,8 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
         let expected = CommitRef {
             tree: b"6ba2a0ded519f737fd5b8d5ccfb141125ef3176f".as_bstr(),
             parents: vec![].into(),
-            author: signature(1528473303),
-            committer: signature(1528473303),
+            author: signature(b"1528473303 +0200"),
+            committer: signature(b"1528473303 +0200"),
             encoding: None,
             message: b"initial commit\n".as_bstr(),
             extra_headers: vec![(b"gpgsig".as_bstr(), b"-----BEGIN PGP SIGNATURE-----\nComment: GPGTools - https://gpgtools.org\n\niQIzBAABCgAdFiEEw7xSvXbiwjusbsBqZl+Z+p2ZlmwFAlsaptwACgkQZl+Z+p2Z\nlmxXSQ//fj6t7aWoEKeMdFigfj6OXWPUyrRbS0N9kpJeOfA0BIOea/6Jbn8J5qh1\nYRfrySOzHPXR5Y+w4GwLiVas66qyhAbk4yeqZM0JxBjHDyPyRGhjUd3y7WjEa6bj\nP0ACAIkYZQ/Q/LDE3eubmhAwEobBH3nZbwE+/zDIG0i265bD5C0iDumVOiKkSelw\ncr6FZVw1HH+GcabFkeLRZLNGmPqGdbeBwYERqb0U1aRCzV1xLYteoKwyWcYaH8E3\n97z1rwhUO/L7o8WUEJtP3CLB0zuocslMxskf6bCeubBnRNJ0YrRmxGarxCP3vn4D\n3a/MwECnl6mnUU9t+OnfvrzLDN73rlq8iasUq6hGe7Sje7waX6b2UGpxHqwykmXg\nVimD6Ah7svJanHryfJn38DvJW/wOMqmAnSUAp+Y8W9EIe0xVntCmtMyoKuqBoY7T\nJlZ1kHJte6ELIM5JOY9Gx7D0ZCSKZJQqyjoqtl36dsomT0I78/+7QS1DP4S6XB7d\nc3BYH0JkW81p7AAFbE543ttN0Z4wKXErMFqUKnPZUIEuybtlNYV+krRdfDBWQysT\n3MBebjguVQ60oGs06PzeYBosKGQrHggAcwduLFuqXhLTJqN4UQ18RkE0vbtG3YA0\n+XtZQM13vURdfwFI5qitAGgw4EzPVrkWWzApzLCrRPEMbvP+b9A=\n=2qqN\n-----END PGP SIGNATURE-----\n".as_bstr().into())]
@@ -429,14 +428,10 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
     }
 }
 
-fn signature(seconds: SecondsSinceUnixEpoch) -> gix_actor::SignatureRef<'static> {
+fn signature(time: &[u8]) -> gix_actor::SignatureRef<'_> {
     gix_actor::SignatureRef {
         name: b"Sebastian Thiel".as_bstr(),
         email: b"byronimo@gmail.com".as_bstr(),
-        time: Time {
-            seconds,
-            offset: 7200,
-            sign: Sign::Plus,
-        },
+        time: time.as_bstr(),
     }
 }
diff --git a/gix-ref/src/store/file/log/line.rs b/gix-ref/src/store/file/log/line.rs
@@ -190,7 +190,6 @@ pub mod decode {
     #[cfg(test)]
     mod test {
         use super::*;
-        use gix_date::{time::Sign, Time};
 
         /// Convert a hexadecimal hash into its corresponding `ObjectId` or _panic_.
         fn hex_to_oid(hex: &str) -> gix_hash::ObjectId {
@@ -250,11 +249,7 @@ pub mod decode {
                         signature: gix_actor::SignatureRef {
                             name: b"name".as_bstr(),
                             email: b"foo@example.com".as_bstr(),
-                            time: Time {
-                                seconds: 1234567890,
-                                offset: 0,
-                                sign: Sign::Minus
-                            }
+                            time: b"1234567890 -0000".as_bstr()
                         },
                         message: b"".as_bstr(),
                     }
@@ -278,11 +273,7 @@ pub mod decode {
                     signature: gix_actor::SignatureRef {
                         name: b"Sebastian Thiel".as_bstr(),
                         email: b"foo@example.com".as_bstr(),
-                        time: Time {
-                            seconds: 1618030561,
-                            offset: 28800,
-                            sign: Sign::Plus,
-                        },
+                        time: b"1618030561 +0800".as_bstr(),
                     },
                     message: b"pull --ff-only: Fast-forward".as_bstr(),
                 };
diff --git a/gix-ref/src/store/file/loose/reflog/create_or_update/tests.rs b/gix-ref/src/store/file/loose/reflog/create_or_update/tests.rs
@@ -1,5 +1,4 @@
 use gix_actor::Signature;
-use gix_date::{time::Sign, Time};
 use gix_object::bstr::ByteSlice;
 use gix_testtools::tempfile::TempDir;
 
@@ -57,11 +56,7 @@ fn missing_reflog_creates_it_even_if_similarly_named_empty_dir_exists_and_append
         let committer = Signature {
             name: "committer".into(),
             email: "committer@example.com".into(),
-            time: Time {
-                seconds: 1234,
-                offset: 1800,
-                sign: Sign::Plus,
-            },
+            time: "1234 +0800".into(),
         };
         store.reflog_create_or_append(
             full_name,
diff --git a/gix-ref/tests/refs/file/log.rs b/gix-ref/tests/refs/file/log.rs
@@ -38,7 +38,7 @@ mod line {
             let line = log::LineRef::from_bytes(b"7b114132d03c468a9cd97836901553658c9792de 306cdbab5457c323d1201aa8a59b3639f600a758 First Last <first.last@example.com> 1727013187 +0200\trebase (pick): Replace Into<Range<u32>> by From<LineRange>")?;
             assert_eq!(line.signature.name, "First Last");
             assert_eq!(line.signature.email, "first.last@example.com");
-            assert_eq!(line.signature.time.seconds, 1727013187);
+            assert_eq!(line.signature.seconds(), 1727013187);
             assert_eq!(
                 line.message,
                 "rebase (pick): Replace Into<Range<u32>> by From<LineRange>"
diff --git a/gix-ref/tests/refs/file/transaction/mod.rs b/gix-ref/tests/refs/file/transaction/mod.rs
@@ -1,5 +1,4 @@
 pub(crate) mod prepare_and_commit {
-    use gix_date::{time::Sign, Time};
     use gix_hash::ObjectId;
     use gix_object::bstr::BString;
     use gix_ref::{
@@ -30,11 +29,7 @@ pub(crate) mod prepare_and_commit {
         gix_actor::Signature {
             name: "committer".into(),
             email: "committer@example.com".into(),
-            time: Time {
-                seconds: 1234,
-                offset: 1800,
-                sign: Sign::Plus,
-            },
+            time: "1234 +0800".into(),
         }
     }
 
diff --git a/gix-revwalk/src/graph/commit.rs b/gix-revwalk/src/graph/commit.rs
@@ -20,7 +20,7 @@ impl<'graph, 'cache> LazyCommit<'graph, 'cache> {
     /// Note that this can only fail if the commit is backed by the object database *and* parsing fails.
     pub fn committer_timestamp(&self) -> Result<SecondsSinceUnixEpoch, gix_object::decode::Error> {
         Ok(match &self.backing {
-            Either::Left(buf) => gix_object::CommitRefIter::from_bytes(buf).committer()?.time.seconds,
+            Either::Left(buf) => gix_object::CommitRefIter::from_bytes(buf).committer()?.seconds(),
             Either::Right((cache, pos)) => cache.commit_at(*pos).committer_timestamp() as SecondsSinceUnixEpoch, // a cast as we cannot represent the error and trying seems overkill
         })
     }
@@ -38,10 +38,7 @@ impl<'graph, 'cache> LazyCommit<'graph, 'cache> {
         &self,
     ) -> Result<(Option<Generation>, SecondsSinceUnixEpoch), gix_object::decode::Error> {
         Ok(match &self.backing {
-            Either::Left(buf) => (
-                None,
-                gix_object::CommitRefIter::from_bytes(buf).committer()?.time.seconds,
-            ),
+            Either::Left(buf) => (None, gix_object::CommitRefIter::from_bytes(buf).committer()?.seconds()),
             Either::Right((cache, pos)) => {
                 let commit = cache.commit_at(*pos);
                 (
@@ -69,7 +66,7 @@ impl<'graph, 'cache> LazyCommit<'graph, 'cache> {
                         Token::Parent { id } => parents.push(id),
                         Token::Author { .. } => {}
                         Token::Committer { signature } => {
-                            timestamp = Some(signature.time.seconds);
+                            timestamp = Some(signature.seconds());
                             break;
                         }
                         _ => {
diff --git a/gix-traverse/src/commit/simple.rs b/gix-traverse/src/commit/simple.rs
@@ -150,7 +150,7 @@ mod init {
                     let state = &mut self.state;
                     for commit_id in state.next.drain(..) {
                         let commit_iter = self.objects.find_commit_iter(&commit_id, &mut state.buf)?;
-                        let time = commit_iter.committer()?.time.seconds;
+                        let time = commit_iter.committer()?.seconds();
                         let key = to_queue_key(time, order);
                         match (cutoff_time, order) {
                             (Some(cutoff_time), _) if time >= cutoff_time => {
@@ -351,7 +351,7 @@ mod init {
 
                                 let parent = self.objects.find_commit_iter(id.as_ref(), &mut state.parents_buf).ok();
                                 let parent_commit_time = parent
-                                    .and_then(|parent| parent.committer().ok().map(|committer| committer.time.seconds))
+                                    .and_then(|parent| parent.committer().ok().map(|committer| committer.seconds()))
                                     .unwrap_or_default();
 
                                 let time = to_queue_key(parent_commit_time, order);
diff --git a/gix-traverse/src/commit/topo/iter.rs b/gix-traverse/src/commit/topo/iter.rs
@@ -304,7 +304,7 @@ pub(super) fn gen_and_commit_time(c: Either<'_, '_>) -> Result<GenAndCommitTime,
                     Ok(T::Parent { .. }) => continue,
                     Ok(T::Author { .. }) => continue,
                     Ok(T::Committer { signature }) => {
-                        commit_time = signature.time.seconds;
+                        commit_time = signature.seconds();
                         break;
                     }
                     Ok(_unused_token) => break,
diff --git a/gix/src/commit.rs b/gix/src/commit.rs
@@ -126,7 +126,7 @@ pub mod describe {
                         let (prio, tag_time) = match target_id {
                             Some(target_id) if peeled_id != *target_id => {
                                 let tag = repo.find_object(target_id).ok()?.try_into_tag().ok()?;
-                                (1, tag.tagger().ok()??.time.seconds)
+                                (1, tag.tagger().ok()??.seconds())
                             }
                             _ => (0, 0),
                         };
@@ -159,7 +159,7 @@ pub mod describe {
                             // TODO: we assume direct refs for tags, which is the common case, but it doesn't have to be
                             //       so rather follow symrefs till the first object and then peel tags after the first object was found.
                             let tag = r.try_id()?.object().ok()?.try_into_tag().ok()?;
-                            let tag_time = tag.tagger().ok().and_then(|s| s.map(|s| s.time.seconds)).unwrap_or(0);
+                            let tag_time = tag.tagger().ok().and_then(|s| s.map(|s| s.seconds())).unwrap_or(0);
                             let commit_id = tag.target_id().ok()?.object().ok()?.try_into_commit().ok()?.id;
                             Some((commit_id, tag_time, Cow::<BStr>::from(r.name().shorten().to_owned())))
                         })
diff --git a/gix/src/config/tree/sections/gitoxide.rs b/gix/src/config/tree/sections/gitoxide.rs
@@ -511,11 +511,11 @@ mod subsections {
 
     impl Commit {
         /// The `gitoxide.commit.authorDate` key.
-        pub const AUTHOR_DATE: keys::Time =
-            keys::Time::new_time("authorDate", &Gitoxide::COMMIT).with_environment_override("GIT_AUTHOR_DATE");
+        pub const AUTHOR_DATE: keys::Any =
+            keys::Any::new("authorDate", &Gitoxide::COMMIT).with_environment_override("GIT_AUTHOR_DATE");
         /// The `gitoxide.commit.committerDate` key.
-        pub const COMMITTER_DATE: keys::Time =
-            keys::Time::new_time("committerDate", &Gitoxide::COMMIT).with_environment_override("GIT_COMMITTER_DATE");
+        pub const COMMITTER_DATE: keys::Any =
+            keys::Any::new("committerDate", &Gitoxide::COMMIT).with_environment_override("GIT_COMMITTER_DATE");
     }
 
     impl Section for Commit {
diff --git a/gix/src/object/commit.rs b/gix/src/object/commit.rs
diff --git a/gix/src/remote/connection/fetch/update_refs/mod.rs b/gix/src/remote/connection/fetch/update_refs/mod.rs
diff --git a/gix/src/repository/identity.rs b/gix/src/repository/identity.rs
diff --git a/gix/src/revision/spec/parse/delegate/revision.rs b/gix/src/revision/spec/parse/delegate/revision.rs
diff --git a/gix/src/revision/spec/parse/error.rs b/gix/src/revision/spec/parse/error.rs
diff --git a/gix/tests/gix/repository/config/identity.rs b/gix/tests/gix/repository/config/identity.rs
diff --git a/gix/tests/gix/repository/object.rs b/gix/tests/gix/repository/object.rs

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ fn fetch_rev_info(`
`84`	`84`	`Ok(match object.kind {`
`85`	`85`	`gix::object::Kind::Commit => {`
`86`	`86`	`let commit = object.into_commit();`
`87`		`- (Some(commit.committer()?.time.seconds), commit.tree_id()?.detach())`
	`87`	`+ (Some(commit.committer()?.seconds()), commit.tree_id()?.detach())`
`88`	`88`	`}`
`89`	`89`	`gix::object::Kind::Tree => (None, object.id),`
`90`	`90`	`gix::object::Kind::Tag => fetch_rev_info(object.peel_to_kind(gix::object::Kind::Commit)?)?,`
Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ type CommitTime = i64;`
`672`	`672`	`fn commit_time(commit: gix_traverse::commit::Either<'_, '_>) -> Result<CommitTime, gix_object::decode::Error> {`
`673`	`673`	`match commit {`
`674`	`674`	`gix_traverse::commit::Either::CommitRefIter(commit_ref_iter) => {`
`675`		`- commit_ref_iter.committer().map(\|c\| c.time.seconds)`
	`675`	`+ commit_ref_iter.committer().map(\|c\| c.seconds())`
`676`	`676`	`}`
`677`	`677`	`gix_traverse::commit::Either::CachedCommit(commit) => Ok(commit.committer_timestamp() as i64),`
`678`	`678`	`}`
`@@ -701,7 +701,7 @@ fn collect_parents(`
`701`	`701`	`for id in commit_ref_iter.parent_ids() {`
`702`	`702`	`let parent = odb.find_commit_iter(id.as_ref(), buf).ok();`
`703`	`703`	`let parent_commit_time = parent`
`704`		`- .and_then(\|parent\| parent.committer().ok().map(\|committer\| committer.time.seconds))`
	`704`	`+ .and_then(\|parent\| parent.committer().ok().map(\|committer\| committer.seconds()))`
`705`	`705`	`.unwrap_or_default();`
`706`	`706`	`parent_ids.push((id, parent_commit_time));`
`707`	`707`	`}`