From 54f1b00447af389f4388b39fa3d3ab28b43bcbd6 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sun, 2 Mar 2025 13:11:38 -0800
Subject: [PATCH] Log git source commit (#34749)

* Log git source commit

* strip

* fix trim

* no trim
---
 cereal/log.capnp         | 4 ++++
 common/util.cc           | 1 -
 release/build_devel.sh   | 4 ++++
 system/loggerd/logger.cc | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cereal/log.capnp b/cereal/log.capnp
index 8aa95ad6e6..78b511ca64 100644
--- a/cereal/log.capnp
+++ b/cereal/log.capnp
@@ -151,6 +151,10 @@ struct InitData {
   gitBranch @11 :Text;
   gitRemote @13 :Text;
 
+  # this is source commit for prebuilt branches
+  gitSrcCommit @23 :Text;
+  gitSrcCommitDate @24 :Text;
+
   androidProperties @16 :Map(Text, Text);
 
   pandaInfo @8 :PandaInfo;
diff --git a/common/util.cc b/common/util.cc
index 096df85634..a853faed04 100644
--- a/common/util.cc
+++ b/common/util.cc
@@ -257,7 +257,6 @@ bool ends_with(const std::string& s, const std::string& suffix) {
 
 std::string strip(const std::string &str) {
   auto should_trim = [](unsigned char ch) {
-    // trim whitespace or a null character
     return std::isspace(ch) || ch == '\0';
   };
 
diff --git a/release/build_devel.sh b/release/build_devel.sh
index 666e9f1276..05dcaafcaa 100755
--- a/release/build_devel.sh
+++ b/release/build_devel.sh
@@ -51,9 +51,13 @@ rm -f panda/board/obj/panda.bin.signed
 
 # include source commit hash and build date in commit
 GIT_HASH=$(git --git-dir=$SOURCE_DIR/.git rev-parse HEAD)
+GIT_COMMIT_DATE=$(git --git-dir=$SOURCE_DIR/.git show --no-patch --format='%ct %ci' HEAD)
 DATETIME=$(date '+%Y-%m-%dT%H:%M:%S')
 VERSION=$(cat $SOURCE_DIR/common/version.h | awk -F\" '{print $2}')
 
+echo -n "$GIT_HASH" > git_src_commit
+echo -n "$GIT_COMMIT_DATE" > git_src_commit_date
+
 echo "[-] committing version $VERSION T=$SECONDS"
 git add -f .
 git status
diff --git a/system/loggerd/logger.cc b/system/loggerd/logger.cc
index 1461ceaca6..f07aee1596 100644
--- a/system/loggerd/logger.cc
+++ b/system/loggerd/logger.cc
@@ -50,6 +50,10 @@ kj::Array<capnp::word> logger_build_init_data() {
   init.setPassive(false);
   init.setDongleId(params_map["DongleId"]);
 
+  // for prebuilt branches
+  init.setGitSrcCommit(util::read_file("../../git_src_commit"));
+  init.setGitSrcCommitDate(util::read_file("../../git_src_commit_date"));
+
   auto lparams = init.initParams().initEntries(params_map.size());
   int j = 0;
   for (auto& [key, value] : params_map) {