about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-06-05 15:22:37 -0700
committerbors <bors@rust-lang.org>2013-06-05 15:22:37 -0700
commitf5ef0766da03b15262c410953316541ff9f931d4 (patch)
tree5c37489f72b48a985716cea3d05663fc0d57f81b
parent2c65e2e385cc2a23a50a575a78868b20010e7172 (diff)
parent1a98726d073a24a38f46e5c7dc08cdcaa8f422ae (diff)
downloadrust-f5ef0766da03b15262c410953316541ff9f931d4.tar.gz
rust-f5ef0766da03b15262c410953316541ff9f931d4.zip
auto merge of #6951 : artagnon/rust/makefile-git, r=brson
git log -1 --pretty=format:'%H' is a very convoluted way of saying git
rev-parse HEAD.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
-rw-r--r--Makefile.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index f6b50b5491a..ca82f296022 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -146,8 +146,7 @@ ifneq ($(wildcard $(CFG_GIT)),)
 ifneq ($(wildcard $(CFG_GIT_DIR)),)
     CFG_VERSION += $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
                      --pretty=format:'(%h %ci)')
-    CFG_VER_HASH = $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
-                     --pretty=format:'%H')
+    CFG_VER_HASH = $(shell git --git-dir=$(CFG_GIT_DIR) rev-parse HEAD)
 endif
 endif