From 2a7c68bd60c944737771b8e496aadcacf74d7e49 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Mon, 11 Dec 2023 17:02:58 +0100 Subject: [PATCH 1/2] Fix `--version` output Signed-off-by: Tim Vaillancourt --- go/cmd/gh-ost/main.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/go/cmd/gh-ost/main.go b/go/cmd/gh-ost/main.go index aac5a9b99..b238f91b9 100644 --- a/go/cmd/gh-ost/main.go +++ b/go/cmd/gh-ost/main.go @@ -161,11 +161,13 @@ func main() { return } if *version { - appVersion := AppVersion - if appVersion == "" { - appVersion = "unversioned" + if AppVersion == "" { + AppVersion = "unversioned" } - fmt.Printf("%s (git commit: %s)", appVersion, GitCommit) + if GitCommit == "" { + GitCommit = "unknown" + } + fmt.Printf("%s (git commit: %s)\n", AppVersion, GitCommit) return } From 87d7576764ab44052585abe255962801f5674316 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Mon, 11 Dec 2023 17:07:02 +0100 Subject: [PATCH 2/2] Always fallback version/commit if undef Signed-off-by: Tim Vaillancourt --- go/cmd/gh-ost/main.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/go/cmd/gh-ost/main.go b/go/cmd/gh-ost/main.go index b238f91b9..139703077 100644 --- a/go/cmd/gh-ost/main.go +++ b/go/cmd/gh-ost/main.go @@ -160,13 +160,14 @@ func main() { flag.PrintDefaults() return } + + if AppVersion == "" { + AppVersion = "unversioned" + } + if GitCommit == "" { + GitCommit = "unknown" + } if *version { - if AppVersion == "" { - AppVersion = "unversioned" - } - if GitCommit == "" { - GitCommit = "unknown" - } fmt.Printf("%s (git commit: %s)\n", AppVersion, GitCommit) return }