Only override version pre-release if blank

commands.go

@@ -1,11 +1,12 @@
 package main
 
 import (
+	"os"
+	"os/signal"
+
 	"github.com/hashicorp/consul/command"
 	"github.com/hashicorp/consul/command/agent"
 	"github.com/mitchellh/cli"
-	"os"
-	"os/signal"
 )
 
 // Commands is the mapping of all the available Consul commands.
@@ -94,14 +95,13 @@ func init() {
 		},
 
 		"version": func() (cli.Command, error) {
-			ver := ""
+			ver := Version
-			rel := ""
+			rel := VersionPrerelease
-			if len(GitDescribe) == 0 {
+			if GitDescribe != "" {
-				ver = Version
-				rel = "dev"
-			} else {
 				ver = GitDescribe
-				rel = VersionPrerelease
+			}
+			if GitDescribe == "" && rel == "" {
+				rel = "dev"
 			}
 
 			return &command.VersionCommand{