0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-12 05:09:56 +00:00

Remove "release_" prefix from org-version when org-fixup is run

* UTILITIES/org-fixup.el: Remove "release_" prefix from org-version
  when it is established from git.
This commit is contained in:
Achim Gratz 2012-05-17 12:53:32 +02:00 committed by Bastien Guerry
parent 58e4e212f2
commit 4ea1573b9d

View file

@ -81,19 +81,14 @@
(unwind-protect
(progn
(cd dirorg)
(setq org-git-version
(concat (substring
(shell-command-to-string "git describe --abbrev=6 HEAD")
0 -1)
(when (string-match "\\S-"
(shell-command-to-string
"git status -uno --porcelain"))
".dirty")))
(setq org-version
(substring
(shell-command-to-string "git describe --abbrev=0 HEAD")
0 -1))))
(cd origin)))
(let (( git6 (substring (shell-command-to-string "git describe --abbrev=6 HEAD") 0 -1))
( git0 (substring (shell-command-to-string "git describe --abbrev=0 HEAD") 0 -1))
( gitd (string-match "\\S-" (shell-command-to-string "git status -uno --porcelain"))))
(setq org-git-version (concat git6 (when gitd ".dirty")))
(if (string-match "^release_" git0)
(setq org-version (substring git0 8))
(setq org-version git0)))
(cd origin)))))
`(progn
(defun org-release () ,org-version)
(defun org-git-version () ,org-git-version)