branch: elpa/magit
commit 4fed8d67a5a2edcf541aab6495542e23aff42f9b
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-rebase-autosquash: With a prefix allow selecting beginning
---
docs/magit.org | 5 +++++
lisp/magit-sequence.el | 33 ++++++++++++++++++---------------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/docs/magit.org b/docs/magit.org
index 19d86ad731..ea86633e87 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -6014,6 +6014,11 @@ is not enabled in the transient.
This command combines squash and fixup commits with their intended
targets.
+ By default only commits that are not reachable from the upstream
+ branch are potentially squashed into. If no upstream is configured
+ or with a prefix argument, the user is prompted for the first commit
+ to potentially squash into.
+
- Key: r m (magit-rebase-edit-commit) ::
This command starts an interactive rebase sequence that lets the
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 5cc119a110..87ab203e46 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -675,17 +675,13 @@ START has to be selected from a list of recent commits."
(commit args message &optional editor delay-edit-confirm noassert confirm)
(declare (indent 2))
(when commit
- (if (eq commit :merge-base)
- (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)
- (when (or (not (eq this-command 'magit-rebase-interactive))
- magit-rebase-interactive-include-selected)
- (setq commit (concat commit "^")))
- (setq args (cons "--root" args)))))
+ (unless (magit-rev-ancestor-p commit "HEAD")
+ (user-error "%s isn't an ancestor of HEAD" commit))
+ (if (magit-commit-parents commit)
+ (when (or (not (eq this-command 'magit-rebase-interactive))
+ magit-rebase-interactive-include-selected)
+ (setq commit (concat commit "^")))
+ (setq args (cons "--root" args))))
(when (and commit (not noassert))
(setq commit (magit-rebase-interactive-assert
commit delay-edit-confirm
@@ -761,10 +757,17 @@ START has to be selected from a list of recent commits."
nil t))
;;;###autoload
-(defun magit-rebase-autosquash (args)
- "Combine squash and fixup commits with their intended targets."
- (interactive (list (magit-rebase-arguments)))
- (magit-rebase-interactive-1 :merge-base
+(defun magit-rebase-autosquash (select args)
+ "Combine squash and fixup commits with their intended targets.
+By default only squash into commits that are not reachable from
+the upstream branch. If no upstream is configured or with a prefix
+argument, prompt for the first commit to potentially squash into."
+ (interactive (list current-prefix-arg
+ (magit-rebase-arguments)))
+ (magit-rebase-interactive-1
+ (and-let* (((not select))
+ (upstream (magit-get-upstream-branch)))
+ (magit-git-string "merge-base" upstream "HEAD"))
(nconc (list "--autosquash" "--keep-empty") args)
"Type %p on a commit to squash into it and then rebase as necessary,"
"true" nil t))
