[master] 126841f Simplify include/generate.py

[Dridi Boukelmoune]

commit 126841f6a7ecb8c76b45e9795edb5b631fd8f537
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Mar 6 14:50:58 2018 +0100

    Simplify include/generate.py
    
    Closes #2598

diff --git a/include/generate.py b/include/generate.py
index f6cd339..0d9d9b3 100755
--- a/include/generate.py
+++ b/include/generate.py
@@ -50,21 +50,18 @@ def file_header(fo):
 	fo.write("""/*
  * NB:  This file is machine generated, DO NOT EDIT!
  *
- * Edit and run lib/libvcc/generate.py instead.
+ * Edit and run include/generate.py instead.
  */
 
 """)
 
 #######################################################################
 
-if os.path.isdir(os.path.join(srcroot, ".git")):
-	v = subprocess.check_output([
-		"git --git-dir=" + os.path.join(srcroot, ".git") +
-		" show -s --pretty=format:%H"
-	], shell=True, universal_newlines=True)
-	v = v.strip()
-else:
-	v = "NOGIT"
+
+v = subprocess.check_output([
+    "git --git-dir=%s rev-parse HEAD 2>/dev/null || echo NOGIT" %
+    (os.path.join(srcroot, ".git"))
+    ], shell=True, universal_newlines=True).strip()
 
 vcsfn = os.path.join(srcroot, "include", "vcs_version.h")