[elpa] elpa-admin e8d078aac7: * elpa-admin.el (elpaa--fetch): Fix generation of divergence message

[Stefan Monnier]

branch: elpa-admin
commit e8d078aac7323368ce23ac6231a0e501e0e032fb
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * elpa-admin.el (elpaa--fetch): Fix generation of divergence message
---
 elpa-admin.el | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index f72be917c0..49b305c4c3 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -2654,22 +2654,22 @@ relative to elpa root."
           (message "%s" (delete-and-extract-region (point-min) (point-max)))
           (let* ((msg (format "Upstream of %s has DIVERGED!\n\n" pkg)))
             (when (or show-diverged (eq k #'elpaa--push))
-              (setq msg (list msg))
-              (elpaa--call t "git" "log"
-                           "--format=%h  %<(16,trunc)%ae  %s"
-                           (format "%s..%s" urtb ortb))
-              (push "  Local changes:\n" msg)
-              (push (delete-and-extract-region (point-min) (point-max)) msg)
-              (elpaa--call t "git" "log"
-                           "--format=%h  %<(16,trunc)%ae  %s"
-                           (format "%s..%s" ortb urtb))
-              (push "\n  Upstream changes:\n" msg)
-              (push (delete-and-extract-region (point-min) (point-max)) msg)
-              (let ((total-msg
-                     (mapconcat #'identity (nreverse msg) "")))
-                (when show-diverged (setq msg total-msg))
-                (when (eq k #'elpaa--push)
-                  (elpaa--record-sync-failure pkg-spec total-msg))))
+              (let ((msgs (list msg)))
+                (elpaa--call t "git" "log"
+                             "--format=%h  %<(16,trunc)%ae  %s"
+                             (format "%s..%s" urtb ortb))
+                (push "  Local changes:\n" msgs)
+                (push (delete-and-extract-region (point-min) (point-max)) msgs)
+                (elpaa--call t "git" "log"
+                             "--format=%h  %<(16,trunc)%ae  %s"
+                             (format "%s..%s" ortb urtb))
+                (push "\n  Upstream changes:\n" msgs)
+                (push (delete-and-extract-region (point-min) (point-max)) msgs)
+                (let ((total-msg
+                       (mapconcat #'identity (nreverse msgs) "")))
+                  (when show-diverged (setq msg total-msg))
+                  (when (eq k #'elpaa--push)
+                    (elpaa--record-sync-failure pkg-spec total-msg)))))
             (message "%s" msg)))
          ((not (zerop (elpaa--call t "git" "log"
                                    "--format=%h  %<(16,trunc)%ae  %s"