From: Nathan Froyd <froydnj@gmail.com>
Date: Fri, 27 Jan 2017 17:24:56 +0000 (-0500)
Subject: make `cargo --version --verbose` print extra information
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~10^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50e1c1a5bf3f1a009c2da2b37babad835f6b766c;p=cargo.git

make `cargo --version --verbose` print extra information

Fixes #3584.
---

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index c9149c51a..8b9d1a235 100644
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -128,7 +128,18 @@ fn execute(flags: Flags, config: &Config) -> CliResult<Option<()>> {
     let _token = cargo::util::job::setup();
 
     if flags.flag_version {
-        println!("{}", cargo::version());
+        let version = cargo::version();
+        println!("{}", version);
+        if flags.flag_verbose > 0{
+            println!("release: {}.{}.{}",
+                     version.major, version.minor, version.patch);
+            if let Some(ref cfg) = version.cfg_info {
+                if let Some(ref ci) = cfg.commit_info {
+                    println!("commit-hash: {}", ci.commit_hash);
+                    println!("commit-date: {}", ci.commit_date);
+                }
+            }
+        }
         return Ok(None)
     }