github/melpa
1
0
Fork 0
mirror of https://github.com/correl/melpa.git synced 2024-11-21 19:18:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Melpa 2013-12-03 22:53:00 -08:00
parent 5e0a6d205e
commit fe8c32952e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package-build.el
View file

@ -360,7 +360,8 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
(defun pb/checkout-git (name config dir)
"Check package NAME with config CONFIG out of git into DIR."
(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*")
(goto-char (point-max))
(cond
@ -376,10 +377,11 @@ Return a cons cell whose `car' is the root and whose `cdr' is the repository."
(pb/run-process dir "git" "reset" "--hard"
(or commit (concat "origin/" (pb/git-head-branch dir))))
(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'"
(pb/expand-source-file-list dir config))
(pb/find-parse-time
"\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)"))))
(pb/find-parse-time-latest
"\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)" bound))))
(defun pb/checkout-github (name config dir)
"Check package NAME with config CONFIG out of github into DIR."