github/melpa
1
0
Fork 0
mirror of https://github.com/correl/melpa.git synced 2025-03-18 01:04:00 -09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "look at merge commits for git repos as these should effect the version number"

Browse source 
This reverts commit fe8c32952e.
This commit is contained in:
Steve Purcell 2013-12-06 08:23:57 +00:00
parent 91bebef8e9
commit 75d39c590c
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package-build.el
View file

@ -360,8 +360,7 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
(defun pb/checkout-git (name config dir) (defun pb/checkout-git (name config dir)
"Check package NAME with config CONFIG out of git into DIR." "Check package NAME with config CONFIG out of git into DIR."
(let ((repo (plist-get config :url)) (let ((repo (plist-get config :url))
(commit (plist-get config :commit)) (commit (plist-get config :commit)))
(bound (goto-char (point-max))))
(with-current-buffer (get-buffer-create "*package-build-checkout*") (with-current-buffer (get-buffer-create "*package-build-checkout*")
(goto-char (point-max)) (goto-char (point-max))
(cond (cond
@ -377,11 +376,10 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
(pb/run-process dir "git" "reset" "--hard" (pb/run-process dir "git" "reset" "--hard"
(or commit (concat "origin/" (pb/git-head-branch dir)))) (or commit (concat "origin/" (pb/git-head-branch dir))))
(pb/run-process dir "git" "submodule" "update" "--init" "--recursive") (pb/run-process dir "git" "submodule" "update" "--init" "--recursive")
(pb/run-process dir "git" "log" "-n1" "--merges" "--pretty=format:'\%ci'")
(apply 'pb/run-process dir "git" "log" "-n1" "--pretty=format:'\%ci'" (apply 'pb/run-process dir "git" "log" "-n1" "--pretty=format:'\%ci'"
(pb/expand-source-file-list dir config)) (pb/expand-source-file-list dir config))
(pb/find-parse-time-latest (pb/find-parse-time
"\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)" bound)))) "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)"))))
(defun pb/checkout-github (name config dir) (defun pb/checkout-github (name config dir)
"Check package NAME with config CONFIG out of github into DIR." "Check package NAME with config CONFIG out of github into DIR."