build.go: use new combined version string

Previously, when a VERSION file exists it takes precendence over the
git version. This is unfortunate because all restic binaries compiled
from a git checkout will just identify as the latest release (e.g.
'0.1.0'), regardeless of any commits on top of it.

This commit adds a combined version string by using the contents of
the VERSION file, and append the current git version returned by `git
describe` if available, e.g.:

    0.1.0 (v0.1.0-6-gb188217-dirty).

build.go

@@ -200,17 +200,30 @@ func test(gopath string, args ...string) error {
 	return cmd.Run()
 }
 
-// getVersion returns a version string, either from the file VERSION in the
+// getVersion returns a version string which is a combination of the contents
-// current directory or from git.
+// of the file VERSION in the current directory and the version from git (if
+// available).
 func getVersion() string {
-	v, err := ioutil.ReadFile("VERSION")
+	buf, err := ioutil.ReadFile("VERSION")
-	version := strings.TrimSpace(string(v))
+	if err != nil {
-	if err == nil {
+		verbosePrintf("error reading file VERSION: %v\n", err)
-		verbosePrintf("version from file 'VERSION' is %s\n", version)
+	}
-		return version
+	versionFile := strings.TrimSpace(string(buf))
+	verbosePrintf("version from file 'VERSION' is %q\n", versionFile)
+
+	versionGit := gitVersion()
+	verbosePrintf("version from file 'VERSION' is %q\n", versionGit)
+
+	if versionFile == "" && versionGit == "" {
+		return "unknown"
 	}
 
-	return gitVersion()
+	version := versionFile
+	if versionGit != "" {
+		version += " (" + versionGit + ")"
+	}
+
+	return version
 }
 
 // gitVersion returns a version string that identifies the currently checked