FS-4219 --resolve

This commit is contained in:
Jeff Lenk 2012-08-24 08:24:18 -05:00
parent fbc83cb0ea
commit 72d67cdbd8
1 changed files with 2 additions and 8 deletions

View File

@ -375,7 +375,7 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
If strLastCommit <> "" And strLastCommitHuman <> "" And strRevision <> "" Then
'Bild version string
strGitVer = "git~" & strLastCommit & "~" & strRevision
strGitVer = "+git~" & strLastCommit & "~" & strRevision
strVerHuman = strVerRev & "; git at commit " & strRevision & " on " & strLastCommitHuman
'Check for local changes, if found, append to git revision string
@ -390,13 +390,7 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
strVerHuman = ""
End If
If strVerRev = "" Then
VERSION=strGitVer
Else
If strGitVer <> "" Then
VERSION=VERSION & "+" & strGitVer
End If
End If
VERSION=VERSION & strGitVer
sLastVersion = ""
Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)