magit-insert-upstream-branch-header: respect branch.NAME.rebase

magit · Nov 28, 2016 · e65f15d · e65f15d
1 parent f7b7cea
commit e65f15d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lisp/magit.el b/lisp/magit.el
@@ -721,9 +721,10 @@ detached `HEAD'."
     (magit-insert-section (branch pull)
       (let ((rebase (magit-git-string "config"
                                       (format "branch.%s.rebase" branch))))
-        (if (equal rebase "false")
-            (setq rebase nil)
-          (setq rebase (magit-get-boolean "pull.rebase")))
+        (pcase rebase
+          ("true")
+          ("false" (setq rebase nil))
+          (_       (setq rebase (magit-get-boolean "pull.rebase"))))
         (insert (format "%-10s" (or keyword (if rebase "Rebase: " "Merge: ")))))
       (--when-let (and magit-status-show-hashes-in-headers
                        (magit-rev-format "%h" pull))