From 4ebf1a99c12433b9e034afc550a06164f46d8c54 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Wed, 2 Jul 2025 12:18:12 -0500 Subject: [PATCH] josh-sync: Also show the commit timestamp --- crates/josh-sync/src/sync.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/josh-sync/src/sync.rs b/crates/josh-sync/src/sync.rs index 2d89d2d1..75e6ed54 100644 --- a/crates/josh-sync/src/sync.rs +++ b/crates/josh-sync/src/sync.rs @@ -81,6 +81,10 @@ impl GitSync { ]); let new_summary = check_output(["git", "log", "-1", "--format=%h %s", &new_upstream_base]); let new_summary = replace_references(&new_summary, &self.upstream_repo); + let new_timestamp = check_output_cfg("git", |c| { + c.env("TZ", "UTC") + .args(["log", "-1", "--format=%cd", "--date=iso-local"]) + }); // Update rust-version file. As a separate commit, since making it part of // the merge has confused the heck out of josh in the past. @@ -93,7 +97,8 @@ impl GitSync { let prep_message = format!( "Update the upstream Rust version\n\n\ To prepare for merging from {upstream_repo}, set the version file to:\n\n \ - {new_summary}\n\ + {new_summary}\n\n\ + (committed at {new_timestamp})\n\ ", ); run([