branch: elpa/magit
commit 0698aaf9580c09a97175059ae2ced3dcf69880f9
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-insert-rebase-sequence: Rename internal variable
The two backends are now named "merge" and "apply"; no longer
"interactive" and "am", see Git commit [1: 10cdb9f38a].
1: 2020-02-16 10cdb9f38adaa16aad64403bc931405564523985
rebase: rename the two primary rebase backends
---
lisp/magit-sequence.el | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 0ad95d774ce..bc88ff7b5fe 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -968,9 +968,8 @@ If no such sequence is in progress, do nothing."
If no such sequence is in progress, do nothing."
(when (magit-rebase-in-progress-p)
(let* ((gitdir (magit-gitdir))
- (interactive
- (file-directory-p (expand-file-name "rebase-merge" gitdir)))
- (dir (if interactive "rebase-merge/" "rebase-apply/"))
+ (mergep (file-directory-p (expand-file-name "rebase-merge" gitdir)))
+ (dir (if mergep "rebase-merge/" "rebase-apply/"))
(name (thread-first (concat dir "head-name")
(expand-file-name gitdir)
magit-file-line))
@@ -982,7 +981,7 @@ If no such sequence is in progress, do nothing."
(name (or (magit-rev-name name "refs/heads/*") name)))
(magit-insert-section (rebase-sequence)
(magit-insert-heading (format "Rebasing %s onto %s" name onto))
- (if interactive
+ (if mergep
(magit-rebase-insert-merge-sequence onto)
(magit-rebase-insert-apply-sequence onto))
(insert ?\n)))))
