From bc7246ada55995cee75f79dbe12a7f22b91ca397 Mon Sep 17 00:00:00 2001
From: lenemter <lenemter@gmail.com>
Date: Sat, 11 Apr 2026 18:52:30 +0300
Subject: [PATCH] Show git commit hash in `gala --version`

---
 .github/workflows/main.yml | 2 ++
 config.vala.in             | 3 ++-
 meson.build                | 8 ++++++++
 src/Main.vala              | 3 ++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8eb6ef19b..fcbe36727 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,6 +36,7 @@ jobs:
       env:
         DESTDIR: out
       run: |
+        git config --global --add safe.directory "$(pwd)"
         meson build -Ddocumentation=true -Dtests=true
         ninja -C build
         ninja -C build install
@@ -78,6 +79,7 @@ jobs:
         env:
           DESTDIR: out
         run: |
+          git config --global --add safe.directory "$(pwd)"
           meson build
           ninja -C build install
 
diff --git a/config.vala.in b/config.vala.in
index d9aeb2bff..b53889a73 100644
--- a/config.vala.in
+++ b/config.vala.in
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0-or-later
- * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ * SPDX-FileCopyrightText: 2025-2026 elementary, Inc. (https://elementary.io)
  *                         2011 Robert Dyer
  *                         2011 Rico Tzschichholz
  */
@@ -10,4 +10,5 @@ namespace Config {
 	public const string LOCALEDIR = "@LOCALEDIR@";
 	public const string VERSION = "@VERSION@";
 	public const string PLUGINDIR = "@PLUGINDIR@";
+	public const string GIT_HASH = "@GIT_HASH@";
 }
diff --git a/meson.build b/meson.build
index 0e78f370d..091135893 100644
--- a/meson.build
+++ b/meson.build
@@ -25,6 +25,14 @@ conf.set('GETTEXT_PACKAGE', meson.project_name())
 conf.set('LOCALEDIR', locale_dir)
 conf.set('PLUGINDIR', plugins_dir)
 conf.set('VERSION', meson.project_version())
+
+git = find_program('git', required: false)
+git_hash = 'unknown'
+if git.found()
+	git_hash = run_command(['git', 'rev-parse', '--short', 'HEAD'], capture : true, check : true).stdout().strip()
+endif
+conf.set('GIT_HASH', git_hash)
+
 config_header = configure_file (
     input: 'config.vala.in',
     output: 'config.vala',
diff --git a/src/Main.vala b/src/Main.vala
index 420e33b7b..f97ca422e 100644
--- a/src/Main.vala
+++ b/src/Main.vala
@@ -1,5 +1,6 @@
 //
 //  Copyright (C) 2012 Tom Beckmann, Rico Tzschichholz
+//  Copyright (C) 2026 elementary, Inc.
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@ namespace Gala {
     };
 
     private void print_version () {
-        stdout.printf ("Gala %s\n", Config.VERSION);
+        stdout.printf ("Gala %s (%s)\n", Config.VERSION, Config.GIT_HASH);
         Meta.exit (Meta.ExitCode.SUCCESS);
     }