diff --git a/package-build.el b/package-build.el index a66cf7fe..3b094456 100644 --- a/package-build.el +++ b/package-build.el @@ -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) "Check package NAME with config CONFIG out of git into DIR." (let ((repo (plist-get config :url)) - (commit (plist-get config :commit)) - (bound (goto-char (point-max)))) + (commit (plist-get config :commit))) (with-current-buffer (get-buffer-create "*package-build-checkout*") (goto-char (point-max)) (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" (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-latest - "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)" bound)))) + (pb/find-parse-time + "\\([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) "Check package NAME with config CONFIG out of github into DIR."