summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2014-11-15 23:48:47 +0100
committerAndreas Schwab <schwab@linux-m68k.org>2014-11-16 00:27:58 +0100
commit10331478318c3030b269a1da3361a8a9e3e7e5f1 (patch)
tree54b3d57fac621f0db9fc47d74f24ee3a1322251f
parent899a5a9882ddb6106dbabf2012c957ea1340ac2a (diff)
downloademacs-10331478318c3030b269a1da3361a8a9e3e7e5f1.tar.gz
Use git rev-parse to get repository version
* version.el (emacs-repository-get-version): Use git rev-parse instead of git log.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/version.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d13a62a9b2d..a4bebf2bee8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-15 Andreas Schwab <schwab@linux-m68k.org>
+
+ * version.el (emacs-repository-get-version): Use git rev-parse
+ instead of git log.
+
2014-11-15 Fabián Ezequiel Gallina <fgallina@gnu.org>
* progmodes/python.el (python-indent-calculate-levels): Fix
diff --git a/lisp/version.el b/lisp/version.el
index 1ea38da9cae..cab2d28db4c 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -187,8 +187,8 @@ only ask the VCS if we cannot find any information ourselves."
(let ((default-directory (file-name-as-directory dir)))
(and (eq 0
(condition-case nil
- (call-process "git" nil '(t nil) nil "log"
- "-1" "--pretty=format:%H")
+ (call-process "git" nil '(t nil) nil "rev-parse"
+ "HEAD")
(error nil)))
(not (zerop (buffer-size)))
(replace-regexp-in-string "\n" "" (buffer-string))))))))