From 23cf9eb04f41d86ab98050eed6e016b98d2c99fe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 11 Jun 2012 12:06:30 -0400
Subject: [PATCH] Refine the build id string

We use git describe to get the SHA1 so that we append -dirty for dirty
worktrees and include the HEAD commit subject and date.
---
 src/Makefile.am  | 2 +-
 src/compositor.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index a94128c..8b633f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ weston_SOURCES =				\
 	weston-egl-ext.h
 
 git-version.h : .FORCE
-	echo "#define WESTON_SHA1 \"$(shell git --git-dir=$(top_srcdir)/.git show-ref --head --hash=20 HEAD)\"" > $@-new
+	echo "#define BUILD_ID \"$(shell git --work-tree=$(top_srcdir) describe --always --dirty) $(shell git --work-tree=$(top_srcdir) log -1 --format='%s (%ci)')\"" > $@-new
 	cmp -s $@ $@-new || cp $@-new $@
 	rm $@-new
 
diff --git a/src/compositor.c b/src/compositor.c
index aa862cd..26c9a95 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3220,7 +3220,7 @@ int main(int argc, char *argv[])
 		   STAMP_SPACE "Bug reports to: %s\n"
 		   STAMP_SPACE "Build: %s\n",
 		   PACKAGE_STRING, PACKAGE_URL, PACKAGE_BUGREPORT,
-		   WESTON_SHA1);
+		   BUILD_ID);
 	log_uname();
 
 	display = wl_display_create();
-- 
2.7.4