From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Sat, 26 Aug 2017 06:47:46 +0000 (+0200)
Subject: Add to -v --version commit date+(optional) trailing X char if some files are changed
X-Git-Tag: VALGRIND_3_14_0~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f9ad501;p=thirdparty%2Fvalgrind.git

Add to -v --version commit date+(optional) trailing X char if some files are changed
---

diff --git a/auxprogs/make_or_upd_vgversion_h b/auxprogs/make_or_upd_vgversion_h
index 92b07086cb..3bccb28297 100755
--- a/auxprogs/make_or_upd_vgversion_h
+++ b/auxprogs/make_or_upd_vgversion_h
@@ -4,7 +4,11 @@ extract_git_version()
 {
     if [ -d "$1"/.git ]
     then
-        git rev-parse --short=10 HEAD
+        REV=$(git show --format=%H#%ci -s $(git rev-parse HEAD) |
+                     sed -e 's/ .*//' -e 's/[0-9a-f]\{30\}#/#/' -e 's/-//g' \
+                         -e 's/#/-/')
+        X=$(git status -s -uno | sed -e 's/.*/X/')
+        echo $REV$X
     else
         echo "unknown"
     fi    
@@ -20,6 +24,11 @@ else
 /* Do not edit: file generated by auxprogs/make_or_upd_vgversion_h.
    This file defines VGGIT, used to report GIT revision
    when using command line options:  -v --version
+   The produced VGGIT format is 
+      hhhhhhhhhh-YYYYMMDDX
+   where hhhhhhhhhh is the first 10 characters of the HEAD commit
+         YYYYMMDD is the commit date
+         Trailing X is present if there are any (non untracked) modified files.
 */
 #define VGGIT "$(extract_git_version .)"
 EOF