Use --first-parent to include merge commits in git log search for change dates

This commit is contained in:
Steve Purcell 2013-12-06 08:26:20 +00:00
parent 75d39c590c
commit b5551d6609

View file

@ -376,7 +376,7 @@ 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")
(apply 'pb/run-process dir "git" "log" "-n1" "--pretty=format:'\%ci'" (apply 'pb/run-process dir "git" "log" "--first-parent" "-n1" "--pretty=format:'\%ci'"
(pb/expand-source-file-list dir config)) (pb/expand-source-file-list dir config))
(pb/find-parse-time (pb/find-parse-time
"\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)")))) "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)"))))