branch: elpa/magit
commit f4c05e9cd44ac1c881e834290479616244bfdb66
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-commit-absorb: Don't hardcode -v argument
Previously the argument was hardcoded and the user could additionally
enable it explicitly. If they did, that resulted in an error because
this command does not support duplicated arguments.
Now we default to high verbosity but let the user drop the argument,
if they so desire.
Closes #5272.
---
lisp/magit-commit.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index 074d653fc82..7323ae19a71 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -456,9 +456,10 @@ With a prefix argument use a transient command to select
infix
arguments. This command requires git-absorb executable, which
is available from https://github.com/tummychow/git-absorb.
See `magit-commit-autofixup' for an alternative implementation."
+ :value '("-v")
["Arguments"
- ("-f" "Skip safety checks" ("-f" "--force"))
- ("-v" "Display more output" ("-v" "--verbose"))]
+ ("-f" "Skip safety checks" ("-f" "--force"))
+ ("-v" "Increase verbosity" ("-v" "--verbose"))]
["Actions"
("x" "Absorb" magit-commit-absorb)]
(interactive (if current-prefix-arg
@@ -481,7 +482,7 @@ See `magit-commit-autofixup' for an alternative
implementation."
(when commit
(setq commit (magit-rebase-interactive-assert commit t)))
(if (and commit (eq phase 'run))
- (progn (magit-run-git-async "absorb" "-v" args "-b" commit) t)
+ (progn (magit-run-git-async "absorb" args "-b" commit) t)
(magit-log-select
(lambda (commit)
(with-no-warnings ; about non-interactive use
