From 5d2120a287ae781e778e05383d8e8d223c49999d Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Tue, 9 Mar 2021 21:53:34 +0000 Subject: [PATCH] Handle merges when looking for release revision For some discussion, see the following thread: https://lists.gnu.org/r/emacs-devel/2021-02/msg01935.html * elpa-admin.el (elpaa--get-release-revision): Follow only the first parent of merge commits. This handles cases where the Version header is updated in a different branch to the current one, as is the case with, e.g., ivy/swiper/counsel, whose external branches in elpa.git have local deletions not present in the upstream. --- elpa-admin.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elpa-admin.el b/elpa-admin.el index 5cb3d261c5..17b3bb1bd4 100644 --- a/elpa-admin.el +++ b/elpa-admin.el @@ -170,7 +170,7 @@ elpaa--get-release-revision (elpaa--call (current-buffer) "git" "log" "-n1" "--oneline" "--no-patch" - "--pretty=format:%H" + "--pretty=format:%H" "--first-parent" "-L" (concat "/^;;* *\\(Package-\\)\\?Version:/,+1:" (elpaa--main-file pkg-spec)))) (buffer-string) -- 2.30.1