From: bors <bors@rust-lang.org>
Date: Sun, 29 Jan 2017 02:06:47 +0000 (+0000)
Subject: Auto merge of #3604 - froydnj:rich-version-info, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8d5383866e387a5bf88e25181d23c1af67cb3abe;p=cargo.git

Auto merge of #3604 - froydnj:rich-version-info, r=alexcrichton

implement `cargo --version --verbose`

As suggested in #3584.  This is a bit underwhelming, and I'm unsure if some of the complexity in froydnj/cargo@775c900 is really warranted, but this series gets the job done.  Sample output when building with `configure` and `make`:

```
froydnj@hawkeye:~/src/cargo.git$ target/x86_64-unknown-linux-gnu/release/cargo --version
cargo-0.17.0-dev (ae4a4d8 2017-01-27)
froydnj@hawkeye:~/src/cargo.git$ target/x86_64-unknown-linux-gnu/release/cargo --version --verbose
cargo-0.17.0-dev (ae4a4d8 2017-01-27)
release: 0.17.0
commit-hash: ae4a4d8fc55bf7eca3d974f953dc61729e4a40db
commit-date: 2017-01-27
```
---

8d5383866e387a5bf88e25181d23c1af67cb3abe
diff --cc src/cargo/lib.rs
index f0a93022a,b1e4198f8..fbcb62c1e
mode 100644,100755..100755
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs