[nongnu] elpa/git-commit 1f74e79743 1/3: magit-rebase-interactive-1: Cosmetics

[ELPA Syncer]

branch: elpa/git-commit
commit 1f74e797437023ad5a46742ff679b370529418c9
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-rebase-interactive-1: Cosmetics
---
 lisp/magit-sequence.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 1d4002309c..df0483010e 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -667,9 +667,9 @@ START has to be selected from a list of recent commits."
   (declare (indent 2))
   (when commit
     (if (eq commit :merge-base)
-        (setq commit (--if-let (magit-get-upstream-branch)
-                         (magit-git-string "merge-base" it "HEAD")
-                       nil))
+        (setq commit
+              (and-let* ((upstream (magit-get-upstream-branch)))
+                (magit-git-string "merge-base" upstream "HEAD")))
       (unless (magit-rev-ancestor-p commit "HEAD")
         (user-error "%s isn't an ancestor of HEAD" commit))
       (if (magit-commit-parents commit)
@@ -690,7 +690,7 @@ START has to be selected from a list of recent commits."
                           editor))
                 process-environment))
         (magit-run-git-sequencer "rebase" "-i" args
-                                 (unless (member "--root" args) commit)))
+                                 (and (not (member "--root" args)) commit)))
     (magit-log-select
       `(lambda (commit)
          ;; In some cases (currently just magit-rebase-remove-commit), "-c