Address review feedback

Signed-off-by: Rashmi Gottipati <[email protected]>

Author: rashmigottipati

Makefile

@@ -295,8 +295,6 @@ VERSION := $(shell git describe --tags --always --dirty)
 endif
 export VERSION
 
-GIT_COMMIT := $(if $(SOURCE_GIT_COMMIT),$(SOURCE_GIT_COMMIT),$(shell git rev-parse HEAD))
-
 ifeq ($(origin CGO_ENABLED), undefined)
 CGO_ENABLED := 0
 endif
@@ -310,7 +308,7 @@ export GO_BUILD_GCFLAGS := all=-trimpath=$(PWD)
 export GO_BUILD_FLAGS :=
 export GO_BUILD_LDFLAGS := -s -w \
     -X '$(VERSION_PATH).version=$(VERSION)' \
--X "$(VERSION_PATH).gitCommit=$(GIT_COMMIT)" \
+	-X '$(VERSION_PATH).gitCommit=$(GIT_COMMIT)' \
 
 BINARIES=operator-controller catalogd
 

internal/shared/version/version.go

@@ -6,7 +6,7 @@ import (
 )
 
 var (
-	gitCommit  = "unknown"
+	gitCommit  = ""
 	commitDate = "unknown"
 	repoState  = "unknown"
 	version    = "unknown"
@@ -29,7 +29,9 @@ func init() {
 	for _, setting := range info.Settings {
 		switch setting.Key {
 		case "vcs.revision":
-			gitCommit = setting.Value
+			if gitCommit == "" {
+				gitCommit = setting.Value
+			}
 		case "vcs.time":
 			commitDate = setting.Value
 		case "vcs.modified":