chore: Fix build version calculation to not count branch commits

twpol · twpol · commit 7fce65653f9f · 2019-01-16T22:05:52.000Z
diff --git a/Build.cmd b/Build.cmd
@@ -92,7 +92,7 @@ IF EXIST ".svn" (
 	FOR /F "usebackq tokens=1" %%R IN (`svn --non-interactive info --show-item revision .`) DO SET Revision=%%R
 )
 IF EXIST ".git" (
-	FOR /F "usebackq tokens=1" %%R IN (`git describe --always`) DO SET Revision=%%R
+	FOR /F "usebackq tokens=1" %%R IN (`git describe --first-parent --always`) DO SET Revision=%%R
 )
 IF "%Revision%" == "000" (
 	>&2 ECHO WARNING: No Subversion or Git revision found.

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ IF EXIST ".svn" (`
`92`	`92`	FOR /F "usebackq tokens=1" %%R IN (`svn --non-interactive info --show-item revision .`) DO SET Revision=%%R
`93`	`93`	`)`
`94`	`94`	`IF EXIST ".git" (`
`95`		- FOR /F "usebackq tokens=1" %%R IN (`git describe --always`) DO SET Revision=%%R
	`95`	+ FOR /F "usebackq tokens=1" %%R IN (`git describe --first-parent --always`) DO SET Revision=%%R
`96`	`96`	`)`
`97`	`97`	`IF "%Revision%" == "000" (`
`98`	`98`	`>&2 ECHO WARNING: No Subversion or Git revision found.`