aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Müller2014-11-14 05:03:32 +0100
committerLars Magne Ingebrigtsen2014-11-14 15:21:31 +0100
commitdf33e85a807656a13b3020d8f65d5da728bb808e (patch)
tree9af170db49db58f95b847c355c7e0e80d197aeef
parent6a079d59b7f5e9ef2a2dc7af18debc1c714ede89 (diff)
downloademacs-df33e85a807656a13b3020d8f65d5da728bb808e.tar.gz
emacs-df33e85a807656a13b3020d8f65d5da728bb808e.zip
(emacs-repository-get-version): Call `git log' with proper format argument
Fixes: debbugs:19049 * version.el (emacs-repository-get-version): Call `git log' command with proper format argument (bug#19049).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/version.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33777c5afa4..ce4221f7795 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-13 Ulrich Müller <ulm@gentoo.org>
2
3 * version.el (emacs-repository-get-version): Call `git log'
4 command with proper format argument (bug#19049).
5
12014-11-10 Glenn Morris <rgm@gnu.org> 62014-11-10 Glenn Morris <rgm@gnu.org>
2 7
3 * startup.el (command-line): Handle nil elements in load-path. 8 * startup.el (command-line): Handle nil elements in load-path.
diff --git a/lisp/version.el b/lisp/version.el
index 68b502ce451..1ea38da9cae 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -188,7 +188,7 @@ only ask the VCS if we cannot find any information ourselves."
188 (and (eq 0 188 (and (eq 0
189 (condition-case nil 189 (condition-case nil
190 (call-process "git" nil '(t nil) nil "log" 190 (call-process "git" nil '(t nil) nil "log"
191 "-1" "--pretty=format:%N") 191 "-1" "--pretty=format:%H")
192 (error nil))) 192 (error nil)))
193 (not (zerop (buffer-size))) 193 (not (zerop (buffer-size)))
194 (replace-regexp-in-string "\n" "" (buffer-string)))))))) 194 (replace-regexp-in-string "\n" "" (buffer-string))))))))