WIP: set GIT_REFLOG_DATE in test_tick

phillipwood · Dec 19, 2024 · 58c3782 · 58c3782
1 parent 591bd5a
commit 58c3782
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/refs/files-backend.c b/refs/files-backend.c
@@ -1892,7 +1892,8 @@ static int files_log_ref_write(struct files_ref_store *refs,
 	result = log_ref_write_fd(logfd, old_oid, new_oid,
 				  fmt_ident(getenv("GIT_COMMITTER_NAME"),
 					    getenv("GIT_COMMITTER_EMAIL"),
-					    WANT_COMMITTER_IDENT, NULL, 0),
+					    WANT_COMMITTER_IDENT,
+					    getenv("GIT_REFLOG_DATE"), 0),
 				  msg);
 	if (result) {
 		struct strbuf sb = STRBUF_INIT;

diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c
@@ -1413,7 +1413,11 @@ static int write_transaction_table(struct reftable_writer *writer, void *cb_data
 	const char *committer_info;
 	int ret = 0;
 
-	committer_info = git_committer_info(0);
+	committer_info = fmt_ident(getenv("GIT_COMMITTER_NAME"),
+			getenv("GIT_COMMITTER_EMAIL"),
+			WANT_COMMITTER_IDENT,
+			getenv("GIT_REFLOG_DATE"), 0),
+git_committer_info(0);
 	if (split_ident_line(&committer_ident, committer_info, strlen(committer_info)))
 		BUG("failed splitting committer info");
 
@@ -1677,7 +1681,10 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data)
 	const char *committer_info;
 	int ret;
 
-	committer_info = git_committer_info(0);
+	committer_info = fmt_ident(getenv("GIT_COMMITTER_NAME"),
+				   getenv("GIT_COMMITTER_EMAIL"),
+				   WANT_COMMITTER_IDENT,
+				   getenv("GIT_REFLOG_DATE"), 0),
 	if (split_ident_line(&committer_ident, committer_info, strlen(committer_info)))
 		BUG("failed splitting committer info");
 

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
@@ -139,7 +139,8 @@ test_tick () {
 	fi
 	GIT_COMMITTER_DATE="$test_tick -0700"
 	GIT_AUTHOR_DATE="$test_tick -0700"
-	export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
+	GIT_REFLOG_DATE="$test_tick -0700"
+	export GIT_COMMITTER_DATE GIT_AUTHOR_DATE GIT_REFLOG_DATE
 }
 
 # Stop execution and start a shell. This is useful for debugging tests.
@@ -397,24 +398,21 @@ test_commit () {
 	then
 		test_tick
 	fi &&
-	GIT_TEST_DATE_NOW=$test_tick TZ=PDT+7 \
-	    git ${indir:+ -C "$indir"} commit \
+	git ${indir:+ -C "$indir"} commit \
 	    ${author:+ --author "$author"} \
 	    $signoff -m "$1" &&
 	case "$tag" in
 	none)
 		;;
 	light)
-		GIT_TEST_DATE_NOW=$test_tick TZ=PDT+7 \
-			git ${indir:+ -C "$indir"} tag "${4:-$1}"
+		git ${indir:+ -C "$indir"} tag "${4:-$1}"
 		;;
 	annotate)
 		if test -z "$notick"
 		then
 			test_tick
 		fi &&
-		GIT_TEST_DATE_NOW=$test_tick TZ=PDT+7 \
-			git ${indir:+ -C "$indir"} tag -a -m "$1" "${4:-$1}"
+		git ${indir:+ -C "$indir"} tag -a -m "$1" "${4:-$1}"
 		;;
 	esac
 }