From be603f593055309b74685bc2aebb8e35e6de2d59 Mon Sep 17 00:00:00 2001 From: Will Stott Date: Fri, 9 Dec 2022 13:07:51 +0000 Subject: [PATCH] fix: always consider timestamps as UTC when loading from commits --- git-date/src/time/format.rs | 2 +- git-date/tests/time/format.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/git-date/src/time/format.rs b/git-date/src/time/format.rs index 825ba8c0f52..02c5df4a032 100644 --- a/git-date/src/time/format.rs +++ b/git-date/src/time/format.rs @@ -63,6 +63,6 @@ impl Time { fn to_time(self) -> time::OffsetDateTime { time::OffsetDateTime::from_unix_timestamp(self.seconds_since_unix_epoch as i64) .expect("always valid unix time") - .replace_offset(time::UtcOffset::from_whole_seconds(self.offset_in_seconds).expect("valid offset")) + .to_offset(time::UtcOffset::from_whole_seconds(self.offset_in_seconds).expect("valid offset")) } } diff --git a/git-date/tests/time/format.rs b/git-date/tests/time/format.rs index 46965627aa6..4d407d9f047 100644 --- a/git-date/tests/time/format.rs +++ b/git-date/tests/time/format.rs @@ -6,7 +6,7 @@ use time::macros::format_description; #[test] fn short() { - assert_eq!(time().format(format::SHORT), "1973-11-29"); + assert_eq!(time().format(format::SHORT), "1973-11-30"); } #[test] @@ -25,24 +25,24 @@ fn raw() { #[test] fn iso8601() { - assert_eq!(time().format(format::ISO8601), "1973-11-29 21:33:09 +0230"); + assert_eq!(time().format(format::ISO8601), "1973-11-30 00:03:09 +0230"); } #[test] fn iso8601_strict() { - assert_eq!(time().format(format::ISO8601_STRICT), "1973-11-29T21:33:09+02:30"); + assert_eq!(time().format(format::ISO8601_STRICT), "1973-11-30T00:03:09+02:30"); } #[test] fn rfc2822() { - assert_eq!(time().format(format::RFC2822), "Thu, 29 Nov 1973 21:33:09 +0230"); + assert_eq!(time().format(format::RFC2822), "Fri, 30 Nov 1973 00:03:09 +0230"); } #[test] fn default() { assert_eq!( time().format(git_date::time::format::DEFAULT), - "Thu Nov 29 1973 21:33:09 +0230" + "Fri Nov 30 1973 00:03:09 +0230" ); } @@ -50,7 +50,7 @@ fn default() { fn custom_compile_time() { assert_eq!( time().format(format_description!("[year]-[month]-[day] [hour]:[minute]:[second]")), - "1973-11-29 21:33:09", + "1973-11-30 00:03:09", ); }