aboutsummaryrefslogtreecommitdiff
path: root/scripts/update_version_stamp.lua
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/update_version_stamp.lua')
-rwxr-xr-xscripts/update_version_stamp.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/update_version_stamp.lua b/scripts/update_version_stamp.lua
index 509e1f6fad..394c4f7694 100755
--- a/scripts/update_version_stamp.lua
+++ b/scripts/update_version_stamp.lua
@@ -20,9 +20,9 @@ end
local versiondeffile = arg[1]
local prefix = arg[2]
-local described = io.popen('git describe --dirty'):read('*l')
+local described = io.popen('git describe --first-parent --dirty 2>/dev/null'):read('*l')
if not described then
- described = io.popen('git describe --tags --always --dirty'):read('*l')
+ described = io.popen('git describe --first-parent --tags --always --dirty'):read('*l')
end
if not described then
io.open(versiondeffile, 'w'):write('\n')