From 2c7bae935ac68acab831fe86e5330d3c9a84a953 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Wed, 10 Aug 2022 12:18:44 +0200
Subject: Configure structopt to report the right version

By default, structopt reports the value provided by
the env var CARGO_PKG_VERSION, feeded by Cargo when reading
Cargo.toml. However for Garage we use a versioning based on git,
so we often report a version that is behind the real version.
In this commit, we create garage_util::version::garage() that
reports the right version and configure all structopt subcommands
to call this function instead of using the env var.
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Cargo.lock')

diff --git a/Cargo.lock b/Cargo.lock
index e1ccfc2d..fb708a8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1176,7 +1176,6 @@ dependencies = [
  "futures-util",
  "garage_util 0.7.0",
  "gethostname",
- "git-version",
  "hex",
  "hyper",
  "k8s-openapi",
@@ -1276,6 +1275,7 @@ dependencies = [
  "err-derive 0.3.1",
  "futures",
  "garage_db",
+ "git-version",
  "hex",
  "http",
  "hyper",
-- 
cgit v1.2.3