From: Stefan Sperling <stsp@stsp.name>
Subject: Re: Regress failures: regress, histedit
To: Christian Weisgerber <naddy@mips.inka.de>, gameoftrees@openbsd.org
Date: Sat, 28 Aug 2021 11:32:10 +0200

On Sat, Aug 28, 2021 at 11:18:20AM +0200, Stefan Sperling wrote:
> On Sat, Aug 28, 2021 at 12:37:30AM +0200, Christian Weisgerber wrote:
> > It's about 00:30 here (UTC+2) and the rebase and histedit regression
> > tests are failing _right now_ for me with various differences like
> > this one:
> > 
> > - 2021-08-27 flan_hacker  committing more changes on newbranch
> > + 2021-08-28 flan_hacker  committing more changes on newbranch
> > 
> > Some confusion about UTC vs. local time?
> 
> I have seen this happen occasionally as well, usually around midnight.
> Never got around to digging deeply. I believe it is a bug in the test code.

Could the problem be that this invocation of 'git show' returns a
non-UTC timestamp?

This patch doesn't prevent tests from passing right now. I would
suggest to apply it and wait to see if the issue ever occurs again.

Or someone with sufficient motivation could move their system clock
to midnight UTC+2 and verify.

diff a099809f2873564368fcd20d3d7be32ce4a5bc12 /home/stsp/src/got
blob - fbd40bcace0448588f375c648b957b069821ab5f
file + regress/cmdline/common.sh
--- regress/cmdline/common.sh
+++ regress/cmdline/common.sh
@@ -72,7 +72,8 @@ git_show_author_time()
 {
 	local repo="$1"
 	local object="$2"
-	(cd $repo && git show --no-patch --pretty='format:%at' $object)
+	(cd $repo && env TZ=UTC \
+		git show --no-patch --pretty='format:%at' $object)
 }
 
 git_show_tagger_time()