From e409f7afd9de120754c9d1595b91a6c13b0d528d Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Sun, 4 Jan 2026 23:04:49 -0700
Subject: [PATCH] ui: Drop xemu branch tracking

---
 scripts/archive-source.sh | 3 +--
 scripts/xemu-version.sh   | 8 --------
 ui/xemu.c                 | 1 -
 ui/xui/compat.cc          | 1 -
 ui/xui/main-menu.cc       | 7 ++++---
 ui/xui/reporting.cc       | 2 +-
 ui/xui/reporting.hh       | 1 -
 xemu-version.c            | 1 -
 xemu-version.h            | 1 -
 9 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index 020d33e588..b6268212d5 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -89,8 +89,7 @@ for sp in $subprojects; do
 done
 
 git rev-parse HEAD 2>/dev/null | tr -d '\n' > XEMU_COMMIT
-git symbolic-ref --short HEAD > XEMU_BRANCH
 git describe --tags --match 'v*' | cut -c 2- | tr -d '\n' > XEMU_VERSION
-tar -r --file "$tar_file" XEMU_COMMIT XEMU_BRANCH XEMU_VERSION
+tar -r --file "$tar_file" XEMU_COMMIT XEMU_VERSION
 
 exit 0
diff --git a/scripts/xemu-version.sh b/scripts/xemu-version.sh
index 0e5b827acc..906330fcdc 100755
--- a/scripts/xemu-version.sh
+++ b/scripts/xemu-version.sh
@@ -11,13 +11,6 @@ XEMU_COMMIT=$( \
   elif test -e XEMU_COMMIT; then \
     cat XEMU_COMMIT; \
   fi)
-XEMU_BRANCH=$( \
-  cd "$dir"; \
-  if test -e .git; then \
-    git symbolic-ref --short HEAD || echo $XEMU_COMMIT; \
-  elif test -e XEMU_BRANCH; then \
-    cat XEMU_BRANCH; \
-  fi)
 XEMU_VERSION=$( \
   cd "$dir"; \
   if test -e .git; then \
@@ -49,7 +42,6 @@ cat <<EOF
 #define XEMU_VERSION_MINOR $XEMU_VERSION_MINOR
 #define XEMU_VERSION_PATCH $XEMU_VERSION_PATCH
 #define XEMU_VERSION_COMMIT $XEMU_VERSION_COMMIT
-#define XEMU_BRANCH        "$XEMU_BRANCH"
 #define XEMU_COMMIT        "$XEMU_COMMIT"
 #define XEMU_DATE          "$XEMU_DATE"
 EOF
diff --git a/ui/xemu.c b/ui/xemu.c
index 3131d52159..9482363542 100644
--- a/ui/xemu.c
+++ b/ui/xemu.c
@@ -1342,7 +1342,6 @@ int main(int argc, char **argv)
 #endif
 
     fprintf(stderr, "xemu_version: %s\n", xemu_version);
-    fprintf(stderr, "xemu_branch: %s\n", xemu_branch);
     fprintf(stderr, "xemu_commit: %s\n", xemu_commit);
     fprintf(stderr, "xemu_date: %s\n", xemu_date);
 
diff --git a/ui/xui/compat.cc b/ui/xui/compat.cc
index 74eec570a7..0fcaf18086 100644
--- a/ui/xui/compat.cc
+++ b/ui/xui/compat.cc
@@ -33,7 +33,6 @@ CompatibilityReporter::CompatibilityReporter()
 
     report.token = "";
     report.xemu_version = xemu_version;
-    report.xemu_branch = xemu_branch;
     report.xemu_commit = xemu_commit;
     report.xemu_date = xemu_date;
     report.os_platform = xemu_get_os_platform();
diff --git a/ui/xui/main-menu.cc b/ui/xui/main-menu.cc
index 050d433e67..51209c4c7b 100644
--- a/ui/xui/main-menu.cc
+++ b/ui/xui/main-menu.cc
@@ -1592,9 +1592,10 @@ void MainMenuAboutView::Draw()
     static const char *build_info_text = NULL;
     if (build_info_text == NULL) {
         build_info_text =
-            g_strdup_printf("Version:      %s\nBranch:       %s\nCommit:       "
-                            "%s\nDate:         %s",
-                            xemu_version, xemu_branch, xemu_commit, xemu_date);
+            g_strdup_printf("Version:      %s\n"
+                            "Commit:       %s\n"
+                            "Date:         %s",
+                            xemu_version, xemu_commit, xemu_date);
     }
 
     static const char *sys_info_text = NULL;
diff --git a/ui/xui/reporting.cc b/ui/xui/reporting.cc
index 2b59281ab9..52a18409f4 100644
--- a/ui/xui/reporting.cc
+++ b/ui/xui/reporting.cc
@@ -44,7 +44,7 @@ const std::string &CompatibilityReport::GetSerializedReport()
 	json report = {
 		{"token", token},
 		{"xemu_version", xemu_version},
-		{"xemu_branch", xemu_branch},
+		{"xemu_branch", ""},
 		{"xemu_commit", xemu_commit},
 		{"xemu_date", xemu_date},
 		{"os_platform", os_platform},
diff --git a/ui/xui/reporting.hh b/ui/xui/reporting.hh
index f823bc4c3c..a405b6c1ce 100644
--- a/ui/xui/reporting.hh
+++ b/ui/xui/reporting.hh
@@ -28,7 +28,6 @@ class CompatibilityReport {
 public:
 	std::string token;
 	std::string xemu_version;
-	std::string xemu_branch;
 	std::string xemu_commit;
 	std::string xemu_date;
 	std::string os_platform;
diff --git a/xemu-version.c b/xemu-version.c
index f2e7a958e9..768ff87099 100644
--- a/xemu-version.c
+++ b/xemu-version.c
@@ -4,6 +4,5 @@ const int xemu_version_major = XEMU_VERSION_MAJOR;
 const int xemu_version_minor = XEMU_VERSION_MINOR;
 const int xemu_version_patch = XEMU_VERSION_PATCH;
 const char *xemu_version = XEMU_VERSION;
-const char *xemu_branch  = XEMU_BRANCH;;
 const char *xemu_commit  = XEMU_COMMIT;
 const char *xemu_date    = XEMU_DATE;
diff --git a/xemu-version.h b/xemu-version.h
index a1fe27fccb..8f7eadba9a 100644
--- a/xemu-version.h
+++ b/xemu-version.h
@@ -5,7 +5,6 @@ extern const int xemu_version_major;
 extern const int xemu_version_minor;
 extern const int xemu_version_patch;
 extern const char *xemu_version;
-extern const char *xemu_branch;
 extern const char *xemu_commit;
 extern const char *xemu_date;