From 1e3b0672d7fbe68b8abd618ec99da48c089c050c Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Tue, 14 Apr 2020 11:13:11 +0200
Subject: [PATCH] config+lnd+lncli: add commit back to version string

---
 cmd/lncli/main.go | 2 +-
 config.go         | 3 ++-
 lnd.go            | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/lncli/main.go b/cmd/lncli/main.go
index a88fc926..52d64ada 100644
--- a/cmd/lncli/main.go
+++ b/cmd/lncli/main.go
@@ -205,7 +205,7 @@ func extractPathArgs(ctx *cli.Context) (string, string, error) {
 func main() {
 	app := cli.NewApp()
 	app.Name = "lncli"
-	app.Version = build.Version()
+	app.Version = build.Version() + " commit=" + build.Commit
 	app.Usage = "control plane for your Lightning Network Daemon (lnd)"
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
diff --git a/config.go b/config.go
index 773c5d00..6816b0e8 100644
--- a/config.go
+++ b/config.go
@@ -478,7 +478,8 @@ func loadConfig() (*config, error) {
 	appName = strings.TrimSuffix(appName, filepath.Ext(appName))
 	usageMessage := fmt.Sprintf("Use %s -h to show usage", appName)
 	if preCfg.ShowVersion {
-		fmt.Println(appName, "version", build.Version())
+		fmt.Println(appName, "version", build.Version(),
+			"commit="+build.Commit)
 		os.Exit(0)
 	}
 
diff --git a/lnd.go b/lnd.go
index 875f0e73..faffac1f 100644
--- a/lnd.go
+++ b/lnd.go
@@ -170,8 +170,9 @@ func Main(lisCfg ListenerCfg) error {
 	}()
 
 	// Show version at startup.
-	ltndLog.Infof("Version: %s, build=%s, logging=%s",
-		build.Version(), build.Deployment, build.LoggingType)
+	ltndLog.Infof("Version: %s commit=%s, build=%s, logging=%s",
+		build.Version(), build.Commit, build.Deployment,
+		build.LoggingType)
 
 	var network string
 	switch {