diff options
Diffstat (limited to 'lisp/km-magit.el')
| -rw-r--r-- | lisp/km-magit.el | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lisp/km-magit.el b/lisp/km-magit.el index 2d04786..9dfefb3 100644 --- a/lisp/km-magit.el +++ b/lisp/km-magit.el @@ -499,19 +499,12 @@ argument." (kill-new (message it)))) (defun km/magit-rev-ancestor-p (rev-a rev-b) - "Report whether REV-A is the ancestor of REV-B. -Use the revision at point as REV-B. With a prefix argument or if -there is no revision at point, prompt for the revision. Always -prompt for REV-A." + "Report whether REV-A is the ancestor of REV-B." (interactive - (let* ((atpoint (or (and magit-blame-mode (magit-blame-chunk-get :hash)) - (magit-branch-or-commit-at-point) - (magit-tag-at-point))) - (commit (or (and (not current-prefix-arg) atpoint) - (magit-read-branch-or-commit "Descendant" atpoint)))) - (list (magit-read-other-branch-or-commit - (format "Test if ancestor of %s" commit) commit) - commit))) + (let* ((rev-a (magit-read-branch-or-commit "Ancestor candidate"))) + (list rev-a (magit-read-other-branch-or-commit + (format "Is %s the ancestor of" rev-a) + rev-a)))) (message "%s is %san ancestor of %s" rev-a (if (magit-git-success "merge-base" "--is-ancestor" rev-a rev-b) |