From 93876028b47ae2bea961201a71ba6e3b42c30b94 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 22 May 2019 17:10:44 -0400
Subject: [PATCH] cli/upgrade: always update packages

Even when Doom is up-to-date.
---
 core/cli/upgrade.el | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/cli/upgrade.el b/core/cli/upgrade.el
index 477e1c89c..25df6a45a 100644
--- a/core/cli/upgrade.el
+++ b/core/cli/upgrade.el
@@ -58,24 +58,24 @@ Doing so is equivalent to:
                 (unless rev
                   (error "Couldn't detect Doom's version. Is %s a repo?"
                          (abbreviate-file-name doom-emacs-dir)))
-                (when (equal current-rev rev)
-                  (user-error "Doom is up to date!"))
-                (message "Updates for Doom are available!\n\n  Old revision: %s\n  New revision: %s\n"
-                         current-rev rev)
-                (message "Comparision diff: https://github.com/hlissner/doom-emacs/compare/%s...%s\n"
-                         (substring current-rev 0 10) (substring rev 0 10))
-                ;; TODO Display newsletter diff
-                (unless (or doom-auto-accept (y-or-n-p "Proceed?"))
-                  (user-error "Aborted"))
-                (message "Removing byte-compiled files from your config (if any)")
-                (doom-clean-byte-compiled-files)
-                (unless (zerop (process-file "git" nil buf nil "reset" "--hard"
-                                             (format "%s/%s" doom-repo-remote branch)))
-                  (error "An error occurred while checking out the latest commit\n\n%s"
-                         (buffer-string)))
-                (unless (equal (vc-git-working-revision doom-emacs-dir) rev)
-                  (error "Failed to checkout latest commit.\n\n%s" (buffer-string)))
-                (doom-refresh doom-auto-accept)
+                (if (equal current-rev rev)
+                    (message "Doom is up to date!")
+                  (message "Updates for Doom are available!\n\n  Old revision: %s\n  New revision: %s\n"
+                           current-rev rev)
+                  (message "Comparision diff: https://github.com/hlissner/doom-emacs/compare/%s...%s\n"
+                           (substring current-rev 0 10) (substring rev 0 10))
+                  ;; TODO Display newsletter diff
+                  (unless (or doom-auto-accept (y-or-n-p "Proceed?"))
+                    (user-error "Aborted"))
+                  (message "Removing byte-compiled files from your config (if any)")
+                  (doom-clean-byte-compiled-files)
+                  (unless (zerop (process-file "git" nil buf nil "reset" "--hard"
+                                               (format "%s/%s" doom-repo-remote branch)))
+                    (error "An error occurred while checking out the latest commit\n\n%s"
+                           (buffer-string)))
+                  (unless (equal (vc-git-working-revision doom-emacs-dir) rev)
+                    (error "Failed to checkout latest commit.\n\n%s" (buffer-string))))
+                (doom-refresh)
                 (doom-packages-update doom-auto-accept)
                 (message "Done! Please restart Emacs for changes to take effect")))
           (user-error